Clean up

Delete now unused files, rename for consistency