Refactoring files into a more logical directory/naming structure
Merge pull request #753 from isuftin/master

Refactoring files into a more logical directory/naming structure