updated naming structure, small fixes to scss modules, getting things sorted