Remove comments and rename files