Move files around, add enum format.