last update for new file structure, completed transition to sass