Fixing a bug or two, moving some sass back into respective directories.