Move enum to proper place