Got scss includes to work
Removed uneeded file
Some major refactoring