restructure to be able to merge to 2d_game
updating include paths