changed file structure
Merge pull request #70 from RichardAvendano/structureChange

Merge complete for change of file structure.