Re-organized sass
Cleanup