Fixing FS structure
Merge pull request #3 from caffeinewriter/fix-fs

Fixing FS structure