restructured folders and edited spacing mixin to include default margin/padding