code cleanup

removed some files
renamed a couple