simplified directory structure and consolidated some .scss files