Lots of Cleanup

Mainly focused on cleaning up the sass structure.