Code: Improved file structure.
Merge pull request #33 from am11/master

Code: Improved file structure