Changed around main file structure and comments
Merge pull request #24 from villanuevawill/feat_main

Changed around main file structure and comments