Reorganized sass file