Updated code structure.
This closes #4
Merge pull request #5 from drincruz/feature/fix_code_structure

Updated code structure.
Merge pull request #6 from drincruz/develop

Develop