move types to own module