Restructuring game project
Shorten namespace