moved package definitions to a separate file