reorganized sass into more logical structure