Changing modules.
Merge pull request #5 from gmaslowski/folder_restruct

Changing modules.