Rename correctly, remove unnecessary folder