diff --git a/api/.travis.yml b/.travis.yml
similarity index 100%
rename from api/.travis.yml
rename to .travis.yml
diff --git a/api/FilterLists.sln b/FilterLists.sln
similarity index 100%
rename from api/FilterLists.sln
rename to FilterLists.sln
diff --git a/api/src/FilterLists.Api/Controllers/ListsController.cs b/src/FilterLists.Api/Controllers/ListsController.cs
similarity index 100%
rename from api/src/FilterLists.Api/Controllers/ListsController.cs
rename to src/FilterLists.Api/Controllers/ListsController.cs
diff --git a/api/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
similarity index 100%
rename from api/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
rename to src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
diff --git a/api/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj
similarity index 100%
rename from api/src/FilterLists.Api/FilterLists.Api.csproj
rename to src/FilterLists.Api/FilterLists.Api.csproj
diff --git a/api/src/FilterLists.Api/Program.cs b/src/FilterLists.Api/Program.cs
similarity index 100%
rename from api/src/FilterLists.Api/Program.cs
rename to src/FilterLists.Api/Program.cs
diff --git a/api/src/FilterLists.Api/Startup.cs b/src/FilterLists.Api/Startup.cs
similarity index 100%
rename from api/src/FilterLists.Api/Startup.cs
rename to src/FilterLists.Api/Startup.cs
diff --git a/api/src/FilterLists.Data/Contexts/FilterListsDbContext.cs b/src/FilterLists.Data/Contexts/FilterListsDbContext.cs
similarity index 100%
rename from api/src/FilterLists.Data/Contexts/FilterListsDbContext.cs
rename to src/FilterLists.Data/Contexts/FilterListsDbContext.cs
diff --git a/api/src/FilterLists.Data/Contexts/IFilterListsDbContext.cs b/src/FilterLists.Data/Contexts/IFilterListsDbContext.cs
similarity index 100%
rename from api/src/FilterLists.Data/Contexts/IFilterListsDbContext.cs
rename to src/FilterLists.Data/Contexts/IFilterListsDbContext.cs
diff --git a/api/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs
similarity index 100%
rename from api/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs
rename to src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs
diff --git a/api/src/FilterLists.Data/FilterLists.Data.csproj b/src/FilterLists.Data/FilterLists.Data.csproj
similarity index 100%
rename from api/src/FilterLists.Data/FilterLists.Data.csproj
rename to src/FilterLists.Data/FilterLists.Data.csproj
diff --git a/api/src/FilterLists.Data/Migrations/20170410220415_Initial.Designer.cs b/src/FilterLists.Data/Migrations/20170410220415_Initial.Designer.cs
similarity index 100%
rename from api/src/FilterLists.Data/Migrations/20170410220415_Initial.Designer.cs
rename to src/FilterLists.Data/Migrations/20170410220415_Initial.Designer.cs
diff --git a/api/src/FilterLists.Data/Migrations/20170410220415_Initial.cs b/src/FilterLists.Data/Migrations/20170410220415_Initial.cs
similarity index 100%
rename from api/src/FilterLists.Data/Migrations/20170410220415_Initial.cs
rename to src/FilterLists.Data/Migrations/20170410220415_Initial.cs
diff --git a/api/src/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs b/src/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs
similarity index 100%
rename from api/src/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs
rename to src/FilterLists.Data/Migrations/FilterListsDbContextModelSnapshot.cs
diff --git a/api/src/FilterLists.Data/Models/BaseEntity.cs b/src/FilterLists.Data/Models/BaseEntity.cs
similarity index 100%
rename from api/src/FilterLists.Data/Models/BaseEntity.cs
rename to src/FilterLists.Data/Models/BaseEntity.cs
diff --git a/api/src/FilterLists.Data/Models/List.cs b/src/FilterLists.Data/Models/List.cs
similarity index 100%
rename from api/src/FilterLists.Data/Models/List.cs
rename to src/FilterLists.Data/Models/List.cs
diff --git a/api/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs b/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs
similarity index 100%
rename from api/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs
rename to src/FilterLists.Data/Repositories/Contracts/IListRepository.cs
diff --git a/api/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs b/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs
similarity index 100%
rename from api/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs
rename to src/FilterLists.Data/Repositories/Implementations/ListRepository.cs
diff --git a/api/src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql b/src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql
similarity index 100%
rename from api/src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql
rename to src/FilterLists.Data/Stored Procedures/InitializeNewTableBaseEntityDefaults.sql
diff --git a/api/src/FilterLists.Services/Contracts/IListService.cs b/src/FilterLists.Services/Contracts/IListService.cs
similarity index 100%
rename from api/src/FilterLists.Services/Contracts/IListService.cs
rename to src/FilterLists.Services/Contracts/IListService.cs
diff --git a/api/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
similarity index 100%
rename from api/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
rename to src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
diff --git a/api/src/FilterLists.Services/FilterLists.Services.csproj b/src/FilterLists.Services/FilterLists.Services.csproj
similarity index 100%
rename from api/src/FilterLists.Services/FilterLists.Services.csproj
rename to src/FilterLists.Services/FilterLists.Services.csproj
diff --git a/api/src/FilterLists.Services/Implementations/ListService.cs b/src/FilterLists.Services/Implementations/ListService.cs
similarity index 100%
rename from api/src/FilterLists.Services/Implementations/ListService.cs
rename to src/FilterLists.Services/Implementations/ListService.cs
diff --git a/api/test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj b/test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
similarity index 100%
rename from api/test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
rename to test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
diff --git a/api/test/FilterLists.Data.Tests/UnitTest1.cs b/test/FilterLists.Data.Tests/UnitTest1.cs
similarity index 100%
rename from api/test/FilterLists.Data.Tests/UnitTest1.cs
rename to test/FilterLists.Data.Tests/UnitTest1.cs
diff --git a/api/test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj b/test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
similarity index 100%
rename from api/test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
rename to test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
diff --git a/api/test/FilterLists.Services.Tests/UnitTest1.cs b/test/FilterLists.Services.Tests/UnitTest1.cs
similarity index 100%
rename from api/test/FilterLists.Services.Tests/UnitTest1.cs
rename to test/FilterLists.Services.Tests/UnitTest1.cs