separated Types.java into separate enum classes and moved enums to categories/