improved file structure
Merge pull request #6 from binaryberry/master

improved file structure