Some more structure in Sass files

This targets #34