Fixed import error
renamed again
fixes to menu options
File Org, Menu working

Big change to file organization, Also menu has been resolved, fixing
button positions and sizing.