Moved directories around
Small text changes
Changed JS locations
Merge branch 'feature/folders'