Big update, finished logic

Finished game logic, moved all files into the first file location for
easier makefile