Moved modules to correct folder
Removed DS_store files
Merge pull request #61 from energee/master

System structure cleanup