Reworks file and directory structure.
Merge pull request #2 from himedlooff/master

Reworks file and directory structure.