Updating sass structure and files, as well as some other refactoring and updates.