first attempt
Merge branch 'quick-style-attempt'

merging in attempts to style
Merge pull request #1 from pandafulmanda/master

moving some files around, attempt to style