restructured project. Added part of game loop
fixed the merge