Matched folder stucture to module structure.
Merge pull request #18 from gwagener/folder_structure

Matched folder stucture to module structure