Move enum to correct place