Begin reorganising themes.
Fix references.
Added missing files! Caused by .gitignore