Moved code to conform to more modular file structure
Merge pull request #36 from gitMbar/dev

Moved code to conform to more modular file structure