switching to types package structure