Naming tweaks
Starting to merge in _s theme
Removing some files
Added require and global scripts