Some restructure to include SCSS framework