Change file structure, modify some scss