Change organization of scss files, started using imports