consolidate css files into css folder and clean up statements