datatypes package/module structure messy