Some house keeping

renamed files to conforme with others
removing old files