Better structure
Merge pull request #124 from kevva/structure

Better structure