renamed and moved enums to another namespace