Improving basic organisation of files, see https://github.com/fboes/sass-styleguide