big refactor fun
renamed bunch of files
Merge branch 'bigrefactor'
jiggery pokery