Moved some SCSS files around, included and fixed some bugs