moved directories around. Something's slightly borked with dashboard.css, will fix later.
commit to push changes
merged weirdness