added more styles, moved files into better organization
Merge branch 'more_cleanup'