Moved artifact-id-aware resources to their proper locations