Rearranged sass files to have a clearer modular structure