diff --git a/src/main.cpp b/main/main.ino
similarity index 91%
rename from src/main.cpp
rename to main/main.ino
index d07ec5e..79e3c21 100644
--- a/src/main.cpp
+++ b/main/main.ino
@@ -128,25 +128,26 @@ void loop() {
 				Serial.print("password> ");
 			}
 
-			while (Serial.available() > 0) {
+			if (Serial.available()) {
 				char c = Serial.read();
+				
 				readString += c;
-			}
 
-			if (readString.length() > 0) {
-				Serial.println(readString);
+				if (c == '\n') {
+					Serial.println(readString);
 
-				if (readString == pass) {
-					isArmed = 0;
+					if (readString == pass) {
+						isArmed = 0;
 
-					playMelody(2, unarmMelody, unarmDurations, noteDelay);
-					Serial.println("Successfully UNARMED.");
-				} else {
-					playMelody(2, armMelody, unarmDurations, noteDelay);
-					Serial.println("Wrong password!");
+						playMelody(2, unarmMelody, unarmDurations, noteDelay);
+						Serial.println("Successfully UNARMED.");
+					} else {
+						playMelody(2, armMelody, unarmDurations, noteDelay);
+						Serial.println("Wrong password!");
+					}
+					readString		 = "";
+					waitingForPass = 0;
 				}
-				readString		 = "";
-				waitingForPass = 0;
 			}
 
 			currentMillis = millis();
diff --git a/src/tone.h b/main/tone.h
similarity index 100%
rename from src/tone.h
rename to main/tone.h