Moving the definitions to correct package.