refactor to follow the way SASS is organized