Cleanup and files renamed