moving everything around and deleting excess stuff
more
more
Merge pull request #33 from FityFity/cleanup_and_restructure

Cleanup and restructure