restructure sass-architecture - again