Better structure

Has to be tested when SCSS will be cleaned