Rearranged some scss imports, deleted old scaffold file