reorganized sass files to have less overlap and ambiguity