several changes and renaming main scss file