moved custom definitions to modules directory, updated manifests