Preparing for new structure
New structure
Merge pull request #3 from jarped/dev

Dev