Restructure

Turns it more into a boilerplate
Merge pull request #5 from simurai/boilerplate

Restructure