Fix formatting and camelcase
some more fixes
remove some unnecessary files