Restructure the codebase
Merge pull request #2 from ironcladlou/restructure

Restructure the codebase