Moved the Main.java into a new longer package