diff --git a/ember/app/components/project-compact.gjs b/ember/app/components/project-compact.gjs
index e364b7f8..b7301697 100644
--- a/ember/app/components/project-compact.gjs
+++ b/ember/app/components/project-compact.gjs
@@ -19,7 +19,7 @@ function icon(status) {
 }
 
 function version(project) {
-  return project.versionedDependencies[0];
+  return project.sources.at(0)?.versions.at(0);
 }
 
 const Dependency = <template>
diff --git a/ember/app/components/project-detailed.gjs b/ember/app/components/project-detailed.gjs
index ed6c4afa..3ecbdf29 100644
--- a/ember/app/components/project-detailed.gjs
+++ b/ember/app/components/project-detailed.gjs
@@ -24,7 +24,7 @@ export default class ProjectDetailedComponent extends Component {
       const project = await this.fetch.fetch(
         `/api/projects/${this.args.project.id}/sync?${new URLSearchParams({
           include:
-            'versionedDependencies,versionedDependencies.releaseVersion,versionedDependencies.releaseVersion.dependency',
+            'sources,sources.versions,sources.versions.release-version,sources.versions.release-version.dependency,sources.maintainers,sources.maintainers.user',
         })}`,
         {
           method: 'POST',
@@ -60,8 +60,8 @@ export default class ProjectDetailedComponent extends Component {
     }
   });
 
-  get dependencyData() {
-    return this.args.project.versionedDependencies.map((version) => ({
+  sourceData(source) {
+    return source.versions.map((version) => ({
       component: <template>
         <tr class='{{statusToClass version.status}}'>{{yield}}</tr>
       </template>,
@@ -76,21 +76,24 @@ export default class ProjectDetailedComponent extends Component {
     }));
   }
 
-  get maintainerData() {
-    return this.args.project.maintainers.map((m) => ({
-      values: {
-        username: <template>
-          {{#if m.isPrimary}}<UkIcon @icon='star' @ratio={{0.5}} />
-          {{/if}}{{m.user.username}}
-        </template>,
-        email: <template>
-          <a
-            class='uk-link-text'
-            href='mailto:{{m.user.email}}'
-          >{{m.user.email}}</a>
-        </template>,
-      },
-    }));
+  maintainerData(source) {
+    return source.maintainers
+      .slice()
+      .sort((a, b) => (a.isPrimary - b.isPrimary) * -1)
+      .map((m) => ({
+        values: {
+          username: <template>
+            {{#if m.isPrimary}}<UkIcon @icon='star' @ratio={{0.5}} />
+            {{/if}}{{m.user.username}}
+          </template>,
+          email: <template>
+            <a
+              class='uk-link-text'
+              href='mailto:{{m.user.email}}'
+            >{{m.user.email}}</a>
+          </template>,
+        },
+      }));
   }
 
   <template>
@@ -109,19 +112,21 @@ export default class ProjectDetailedComponent extends Component {
       </div>
 
       <hr class='seperator' />
-      <Table @data={{this.maintainerData}} @title='Maintainers' as |t|>
-        <t.head />
-        <t.body />
-      </Table>
-      <Table
-        @data={{this.dependencyData}}
-        @fallback='No dependencies yet'
-        @title='Dependencies'
-        as |t|
-      >
-        <t.head />
-        <t.body />
-      </Table>
+      {{#each @project.sources as |source|}}
+        <Table
+          @data={{this.sourceData source}}
+          @fallback='No dependencies yet'
+          @title={{source.path}}
+          as |t|
+        >
+          <t.head />
+          <t.body />
+        </Table>
+        <Table @data={{this.maintainerData source}} as |t|>
+          <t.head />
+          <t.body />
+        </Table>
+      {{/each}}
       <UkButton
         @label='Sync'
         @loading={{this.syncProject.isRunning}}
diff --git a/ember/app/components/project-form/component.js b/ember/app/components/project-form/component.js
index 080600ba..661a7b57 100644
--- a/ember/app/components/project-form/component.js
+++ b/ember/app/components/project-form/component.js
@@ -1,7 +1,6 @@
 import { service } from '@ember/service';
 import Component from '@glimmer/component';
 import { dropTask } from 'ember-concurrency';
-import { scheduleTask } from 'ember-lifeline';
 import { tracked } from 'tracked-built-ins';
 
 import { emptyChangeset } from 'outdated/utils';
@@ -10,7 +9,6 @@ import ProjectValidations from 'outdated/validations/project';
 export default class ProjectFormComponent extends Component {
   @service store;
   @service router;
-  @tracked maintainers;
 
   @service notification;
 
@@ -19,51 +17,23 @@ export default class ProjectFormComponent extends Component {
     this.args.project ?? this.store.createRecord('project'),
   );
 
-  constructor(...args) {
-    super(...args);
-    if (this.args.project) {
-      scheduleTask(this, 'actions', () => {
-        this.maintainers = this.project.maintainers;
-        this.project.users = this.project.maintainers.map((m) => m.user);
-        this.project.primaryMaintainer = this.maintainers?.find(
-          (m) => m.isPrimary,
-        )?.user;
-      });
-    }
-  }
-
   saveProject = dropTask(async () => {
     try {
       if (this.project.repoType === 'public') {
         this.project.accessToken = '';
       }
 
+      document
+        .querySelectorAll('[data-source-form-submit-button]')
+        .forEach((e) => e.click());
+
       const project = await this.project.save({
         adapterOptions: {
           include:
-            'versionedDependencies,versionedDependencies.releaseVersion,versionedDependencies.releaseVersion.dependency,maintainers,maintainers.user',
+            'sources,sources.versions,sources.versions.release-version,sources.versions.release-version.dependency,sources.maintainers,sources.maintainers.user',
         },
       });
 
-      this.maintainers
-        ?.filter((m) => !this.project.users?.includes(m.user))
-        .forEach((m) => m.destroyRecord());
-      this.project.users?.forEach((user) => {
-        const maintainer = this.maintainers?.find((m) => m.user.id === user.id);
-        if (maintainer) {
-          maintainer.isPrimary = user.id === this.primaryMaintainer.id;
-          if (maintainer.hasDirtyAttributes) maintainer.save();
-        } else {
-          this.store
-            .createRecord('maintainer', {
-              user,
-              project,
-              isPrimary: user === this.primaryMaintainer,
-            })
-            .save();
-        }
-      });
-
       this.router.transitionTo('projects.detailed', project.id);
       this.project.accessToken = '';
       this.notification.success('Successfully saved!');
@@ -73,19 +43,11 @@ export default class ProjectFormComponent extends Component {
     }
   });
 
-  get primaryMaintainer() {
-    return (
-      this.project.users?.find(
-        (u) => u.id === this.project.primaryMaintainer?.id,
-      ) ?? this.project.users[0]
-    );
+  get repoTypes() {
+    return ['public', 'access-token'];
   }
 
   get users() {
     return this.store.peekAll('user');
   }
-
-  get repoTypes() {
-    return ['public', 'access-token'];
-  }
 }
diff --git a/ember/app/components/project-form/template.hbs b/ember/app/components/project-form/template.hbs
index cfdcc972..24b87a5f 100644
--- a/ember/app/components/project-form/template.hbs
+++ b/ember/app/components/project-form/template.hbs
@@ -30,26 +30,8 @@
     autocomplete="off"
     @hidden={{(eq this.project.repoType "public")}}
   />
-
-  <f.input
-    @name="users"
-    @type="select"
-    @label="Maintainers"
-    @multiple={{true}}
-    @value={{this.project.users}}
-    @options={{this.users}}
-    @searchField="searchField"
-    @visibleField="fullName"
-  />
-  {{#if (gt this.project.users.length 1)}}
-    <f.input
-      @name="primaryMaintainer"
-      @type="select"
-      @options={{this.project.users}}
-      @value={{this.primaryMaintainer}}
-      @searchField="searchField"
-      @visibleField="fullName"
-    />
-  {{/if}}
+  {{#each @project.sources as |source|}}
+    <SourceForm @source={{source}} />
+  {{/each}}
   <f.button @loading={{this.saveProject.isRunning}} />
 </Form>
\ No newline at end of file
diff --git a/ember/app/components/source-form.gjs b/ember/app/components/source-form.gjs
new file mode 100644
index 00000000..9e93ae95
--- /dev/null
+++ b/ember/app/components/source-form.gjs
@@ -0,0 +1,106 @@
+import { service } from '@ember/service';
+import Component from '@glimmer/component';
+import { dropTask } from 'ember-concurrency';
+import perform from 'ember-concurrency/helpers/perform';
+import { scheduleTask } from 'ember-lifeline';
+import { lt, or } from 'ember-truth-helpers';
+import { tracked } from 'tracked-built-ins';
+
+import Form from './form';
+
+import { emptyChangeset } from 'outdated/utils';
+import SourceValidations from 'outdated/validations/source';
+
+export default class SourceForm extends Component {
+  @service store;
+  @service notification;
+
+  @tracked source = emptyChangeset(SourceValidations, this.args.source);
+
+  constructor(...args) {
+    super(...args);
+
+    scheduleTask(this, 'actions', () => {
+      const source = this.args.source;
+      source.users = source.maintainers.map((m) => m.user);
+      source.primaryMaintainer = source.maintainers.find(
+        (m) => m.isPrimary,
+      )?.user;
+    });
+  }
+
+  get primaryMaintainer() {
+    return (
+      this.source.users?.find(
+        (u) => u.id === this.source.primaryMaintainer?.id,
+      ) ?? this.source.users[0]
+    );
+  }
+
+  get users() {
+    return this.store.peekAll('user');
+  }
+
+  saveMaintainers = dropTask(async () => {
+    try {
+      this.source.maintainers
+        ?.filter(
+          (m) => !this.source.users?.map((u) => u.id).includes(m.user.id),
+        )
+        .forEach((m) => m.destroyRecord());
+      this.source.users
+        ?.filter(
+          (u) => !this.source.maintainers?.find((m) => m.user.id === u.id),
+        )
+        .forEach((user) => {
+          this.store.createRecord('maintainer', {
+            user,
+            source: this.args.source,
+            isPrimary: user.id === this.primaryMaintainer.id,
+          });
+        });
+      this.source.maintainers.forEach((m) => {
+        m.isPrimary = m.user.id === this.primaryMaintainer.id;
+        if (m.hasDirtyAttributes) m.save();
+      });
+      this.store.findRecord('dependency-source', this.source.id, {
+        include: 'maintainers,maintainers.user',
+      });
+      this.notification.success(
+        `Successfully saved maintainers for ${this.source.path}`,
+      );
+    } catch (e) {
+      this.notification.danger(e);
+      console.error(e);
+    }
+  });
+
+  <template>
+    <Form
+      @onSubmit={{perform this.saveMaintainers}}
+      @model={{this.source}}
+      @name={{@source.path}}
+      as |f|
+    >
+      <f.input
+        @label='Maintainers'
+        @name='users'
+        @type='select'
+        @options={{this.users}}
+        @multiple={{true}}
+        @searchField='searchField'
+        @visibleField='fullName'
+      />
+      <f.input
+        @name='primaryMaintainer'
+        @options={{this.source.users}}
+        @hidden={{lt (or this.source.users.length 0) 2}}
+        @value={{this.primaryMaintainer}}
+        @type='select'
+        @searchField='searchField'
+        @visibleField='fullName'
+      />
+      <f.button class='uk-hidden' data-source-form-submit-button />
+    </Form>
+  </template>
+}
diff --git a/ember/app/models/dependency-source.js b/ember/app/models/dependency-source.js
new file mode 100644
index 00000000..7401f81d
--- /dev/null
+++ b/ember/app/models/dependency-source.js
@@ -0,0 +1,20 @@
+import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
+import { tracked } from 'tracked-built-ins';
+
+export default class DependencySourceModel extends Model {
+  @attr status;
+  @attr path;
+
+  @hasMany('version', { inverse: null, async: false }) versions;
+  @hasMany('maintainer', { inverse: 'source', async: false, as: 'source' })
+  maintainers;
+  @belongsTo('project', {
+    inverse: 'sources',
+    async: true,
+    as: 'dependency-source',
+  })
+  project;
+
+  @tracked users;
+  @tracked primaryMaintainer;
+}
diff --git a/ember/app/models/maintainer.js b/ember/app/models/maintainer.js
index 3742782b..471be772 100644
--- a/ember/app/models/maintainer.js
+++ b/ember/app/models/maintainer.js
@@ -2,6 +2,12 @@ import Model, { attr, belongsTo } from '@ember-data/model';
 
 export default class MaintainerModel extends Model {
   @attr isPrimary;
-  @belongsTo('project', { inverse: 'maintainers', async: true }) project;
+  @belongsTo('source', {
+    inverse: 'maintainers',
+    async: true,
+    as: 'maintainer',
+    polymorphic: true,
+  })
+  source;
   @belongsTo('user', { inverse: null, async: false }) user;
 }
diff --git a/ember/app/models/project.js b/ember/app/models/project.js
index 6fea72ad..7acdf1df 100644
--- a/ember/app/models/project.js
+++ b/ember/app/models/project.js
@@ -1,5 +1,4 @@
 import Model, { attr, hasMany } from '@ember-data/model';
-import { tracked } from '@glimmer/tracking';
 
 export default class ProjectModel extends Model {
   @attr name;
@@ -8,11 +7,13 @@ export default class ProjectModel extends Model {
   @attr({ defaultValue: 'public' }) repoType;
   @attr accessToken;
 
-  @hasMany('version', { inverse: null, async: false }) versionedDependencies;
-  @hasMany('maintainer', { inverse: 'project', async: false }) maintainers;
-
-  @tracked users;
-  @tracked primaryMaintainer;
+  @hasMany('dependency-source', {
+    inverse: 'project',
+    async: false,
+    as: 'project',
+    polymorphic: true,
+  })
+  sources;
 
   get repoURL() {
     return `https://${this.repo}`;
diff --git a/ember/app/routes/projects/add.js b/ember/app/routes/projects/add.js
index 8a55ccf8..8da62a47 100644
--- a/ember/app/routes/projects/add.js
+++ b/ember/app/routes/projects/add.js
@@ -5,9 +5,10 @@ export default class ProjectsAddRoute extends Route {
   @service store;
   beforeModel() {
     this.store.findAll('dependency');
-    this.store.findAll('releaseVersion');
+    this.store.findAll('release-version');
     this.store.findAll('version');
     this.store.findAll('user');
     this.store.findAll('maintainer');
+    this.store.findAll('dependency-source');
   }
 }
diff --git a/ember/app/routes/projects/detailed.js b/ember/app/routes/projects/detailed.js
index bd88ca0d..bca2cfc8 100644
--- a/ember/app/routes/projects/detailed.js
+++ b/ember/app/routes/projects/detailed.js
@@ -5,7 +5,7 @@ export default class ProjectDetailedRoute extends Route {
   model(params) {
     return this.store.findRecord('project', params.project_id, {
       include:
-        'versionedDependencies,versionedDependencies.releaseVersion,versionedDependencies.releaseVersion.dependency,maintainers,maintainers.user',
+        'sources,sources.versions,sources.versions.release-version,sources.versions.release-version.dependency,sources.maintainers,sources.maintainers.user',
     });
   }
 }
diff --git a/ember/app/routes/projects/index.js b/ember/app/routes/projects/index.js
index 5186e74a..5deabd36 100644
--- a/ember/app/routes/projects/index.js
+++ b/ember/app/routes/projects/index.js
@@ -14,7 +14,7 @@ export default class ProjectsRoute extends Route {
   model() {
     return this.store.findAll('project', {
       include:
-        'versionedDependencies,versionedDependencies.releaseVersion,versionedDependencies.releaseVersion.dependency,maintainers,maintainers.user',
+        'sources,sources.versions,sources.versions.release-version,sources.versions.release-version.dependency,sources.maintainers,sources.maintainers.user',
     });
   }
 }
diff --git a/ember/app/routes/versions/index.js b/ember/app/routes/versions/index.js
index aeb2a11b..cf26eb6f 100644
--- a/ember/app/routes/versions/index.js
+++ b/ember/app/routes/versions/index.js
@@ -7,7 +7,7 @@ export default class DependencyIndexRoute extends Route {
   async model() {
     await this.store.findAll('project', {
       include:
-        'versionedDependencies,versionedDependencies.releaseVersion,versionedDependencies.releaseVersion.dependency',
+        'sources,sources.versions,sources.versions.release-version,sources.versions.release-version.dependency',
     });
     return await this.store.peekAll('version');
   }
diff --git a/ember/app/validations/project.js b/ember/app/validations/project.js
index e65e5076..9fa8163c 100644
--- a/ember/app/validations/project.js
+++ b/ember/app/validations/project.js
@@ -28,5 +28,4 @@ export default {
       validateFormat({ regex: /^[-_a-zA-Z\d]*$/ }),
     ],
   }),
-  maintainers: [],
 };
diff --git a/ember/app/validations/source.js b/ember/app/validations/source.js
new file mode 100644
index 00000000..1ce0c76d
--- /dev/null
+++ b/ember/app/validations/source.js
@@ -0,0 +1,6 @@
+import { validatePresence } from 'ember-changeset-validations/validators';
+
+export default {
+  users: [validatePresence(true)],
+  primaryMaintainer: [],
+};
diff --git a/ember/mirage/config.js b/ember/mirage/config.js
index 6589dbc0..24c02704 100644
--- a/ember/mirage/config.js
+++ b/ember/mirage/config.js
@@ -40,8 +40,9 @@ function routes() {
   this.passthrough('https://outdated.local/auth/**');
 
   this.namespace = '/api';
-  this.resource('maintainers');
   this.resource('users');
+  this.resource('dependency-sources');
+  this.resource('maintainers');
   this.resource('projects');
   this.resource('versions');
   this.resource('release-versions');
diff --git a/ember/mirage/factories/dependency-source.js b/ember/mirage/factories/dependency-source.js
new file mode 100644
index 00000000..cb9b86e5
--- /dev/null
+++ b/ember/mirage/factories/dependency-source.js
@@ -0,0 +1,55 @@
+import { faker } from '@faker-js/faker';
+import { Factory, trait } from 'miragejs';
+
+export default Factory.extend({
+  path: () =>
+    [
+      faker.helpers.arrayElement([
+        'app',
+        'web',
+        'api',
+        'frontend',
+        'backend',
+        'ember',
+      ]),
+      faker.helpers.arrayElement([
+        'poetry.lock',
+        'pnpm-lock.yaml',
+        'yarn.lock',
+      ]),
+    ].join('/'),
+  status: () => 'UNDEFINED',
+
+  withVersions: trait({
+    status: () =>
+      faker.helpers.arrayElement(['OUTDATED', 'WARNING', 'UP-TO-DATE']),
+
+    afterCreate(source, server) {
+      source.update({
+        versions: [
+          server.create('version', 'isEndOfLife'),
+          server.create('version', 'isNearlyEndOfLife'),
+          server.create('version'),
+        ],
+      });
+    },
+  }),
+
+  withMaintainers: trait({
+    afterCreate(source, server) {
+      source.update({
+        maintainers: [
+          server.create('maintainer', {
+            user: server.create('user'),
+            source,
+            isPrimary: true,
+          }),
+          server.create('maintainer', {
+            user: server.create('user'),
+            source,
+          }),
+        ],
+      });
+    },
+  }),
+});
diff --git a/ember/mirage/factories/project.js b/ember/mirage/factories/project.js
index 500b5ad6..132a9663 100644
--- a/ember/mirage/factories/project.js
+++ b/ember/mirage/factories/project.js
@@ -11,33 +11,24 @@ export default Factory.extend({
       this.name,
     )}`;
   },
-  withVersions: trait({
-    status: () =>
-      faker.helpers.arrayElement(['OUTDATED', 'WARNING', 'UP-TO-DATE']),
-
+  withMaintainers: trait({
     afterCreate(project, server) {
       project.update({
-        versionedDependencies: [
-          server.create('version', 'isEndOfLife'),
-          server.create('version', 'isNearlyEndOfLife'),
-          server.create('version'),
+        sources: [
+          server.create('dependency-source', 'withMaintainers', { project }),
         ],
       });
     },
   }),
-  withMaintainers: trait({
+  withSources: trait({
+    status: () =>
+      faker.helpers.arrayElement(['OUTDATED', 'WARNING', 'UP-TO-DATE']),
+
     afterCreate(project, server) {
       project.update({
-        maintainers: [
-          server.create('maintainer', {
-            user: server.create('user'),
-            project,
-            isPrimary: true,
-          }),
-          server.create('maintainer', {
-            user: server.create('user'),
-            project,
-          }),
+        sources: [
+          server.create('dependency-source', 'withVersions', { project }),
+          server.create('dependency-source', { project }),
         ],
       });
     },
diff --git a/ember/mirage/scenarios/default.js b/ember/mirage/scenarios/default.js
index 801cdfca..63d5a59d 100644
--- a/ember/mirage/scenarios/default.js
+++ b/ember/mirage/scenarios/default.js
@@ -4,8 +4,7 @@ export default function (server) {
     This data will not be loaded in your tests.
   */
   // server.createList('post', 10);
-  server.createList('project', 3, 'withVersions');
+  server.createList('project', 3, 'withSources');
   server.createList('project', 1);
-  server.createList('project', 2, 'withMaintainers', 'withVersions');
   server.createList('user', 2);
 }
diff --git a/ember/tests/acceptance/projects-test.js b/ember/tests/acceptance/projects-test.js
index beca2440..647792fa 100644
--- a/ember/tests/acceptance/projects-test.js
+++ b/ember/tests/acceptance/projects-test.js
@@ -10,7 +10,11 @@ module('Acceptance | projects', function (hooks) {
   setupMirage(hooks);
 
   test('Project clickable and link is correct', async function (assert) {
-    const project = await this.server.create('project', 'withVersions');
+    const project = await this.server.create(
+      'project',
+      'withSources',
+      'withMaintainers',
+    );
 
     await authenticateSession();
     await visit('/');
@@ -25,8 +29,6 @@ module('Acceptance | projects', function (hooks) {
       .dom('[data-test-repo-link]')
       .hasProperty('href', `https://${project.repo}`);
 
-    assert
-      .dom('tbody>tr')
-      .exists({ count: project.versionedDependencies.models.length });
+    assert.dom('h2.table-header').exists({ count: project.sources.length });
   });
 });
diff --git a/ember/tests/integration/components/project-compact-test.js b/ember/tests/integration/components/project-compact-test.js
index df438ea0..318cde7a 100644
--- a/ember/tests/integration/components/project-compact-test.js
+++ b/ember/tests/integration/components/project-compact-test.js
@@ -12,12 +12,12 @@ module('Integration | Component | project-compact', function (hooks) {
   setupIntl(hooks);
 
   test('it renders correctly', async function (assert) {
-    const project = this.server.create('project', 'withVersions');
+    const project = this.server.create('project', 'withSources');
 
     const store = this.owner.lookup('service:store');
     this.project = await store.findRecord('project', project.id, {
       include:
-        'versionedDependencies,versionedDependencies.releaseVersion,versionedDependencies.releaseVersion.dependency',
+        'sources,sources.versions,sources.versions.release-version,sources.versions.release-version.dependency',
     });
     await render(hbs`<ProjectCompact @project={{this.project}} />`);
     assert.dom('[data-test-dependency-compact]').exists();
diff --git a/ember/tests/integration/components/project-detailed-test.js b/ember/tests/integration/components/project-detailed-test.js
index 939f0de3..4ad4d262 100644
--- a/ember/tests/integration/components/project-detailed-test.js
+++ b/ember/tests/integration/components/project-detailed-test.js
@@ -11,12 +11,12 @@ module('Integration | Component | project-detailed', function (hooks) {
   setupIntl(hooks);
 
   test('it renders correctly', async function (assert) {
-    const project = await this.server.create('project', 'withVersions');
+    const project = await this.server.create('project', 'withSources');
     const store = this.owner.lookup('service:store');
 
     this.project = await store.findRecord('project', project.id, {
       include:
-        'versionedDependencies,versionedDependencies.releaseVersion,versionedDependencies.releaseVersion.dependency',
+        'sources,sources.versions,sources.versions.release-version,sources.versions.release-version.dependency,sources.maintainers,sources.maintainers.user',
     });
 
     await render(hbs`<ProjectDetailed @project={{this.project}} />`);
@@ -27,8 +27,8 @@ module('Integration | Component | project-detailed', function (hooks) {
       .hasProperty('href', this.project.repoURL);
 
     assert
-      .dom('tbody>tr')
-      .exists({ count: this.project.versionedDependencies.length });
+      .dom('h2.table-header')
+      .exists({ count: this.project.sources.length });
 
     this.project.versionedDependencies = [];
     await settled();