Rename files and cleanup code.