refactoring code and adding a structure so I can start building levels etc