Basic Menu functionality, Reorganized most classes

Also Game state added