Major overhaul of scss structure and other minor changes