Restructured project
Merge pull request #22 from jacketattack/the-resurrection

Restructured project