rearchitected scripts and scss file structures to match