Updated packages and structured existing code

Need to created better menu options and modify MainClass.java