Clean up project

Clean up and restructure the program to follow good coding practices. remove erros, and tie up all loose ends to get a playable demo.