Fixing FS structure

Previous FS structure wouldn't play nice with JS. This better.