From 5fe712cca67449408ddca4d6b5066cebbb8eb462 Mon Sep 17 00:00:00 2001
From: Jacob Floyd <cognifloyd@gmail.com>
Date: Thu, 23 Sep 2021 06:33:59 -0500
Subject: [PATCH] Move package store/ to server/store/ (#341)

* Refactor: move store/ to server/store/

* fix pipeline for moved tests

Co-authored-by: 6543 <6543@obermui.de>
---
 .woodpecker/main.yml                                        | 4 ++--
 cmd/server/server.go                                        | 2 +-
 cmd/server/setup.go                                         | 4 ++--
 server/api/badge.go                                         | 2 +-
 server/api/build.go                                         | 5 ++---
 server/api/file.go                                          | 2 +-
 server/api/hook.go                                          | 2 +-
 server/api/login.go                                         | 2 +-
 server/api/repo.go                                          | 2 +-
 server/api/stream.go                                        | 2 +-
 server/api/user.go                                          | 2 +-
 server/api/users.go                                         | 2 +-
 server/api/z.go                                             | 2 +-
 server/grpc/rpc.go                                          | 2 +-
 server/router/middleware/session/repo.go                    | 2 +-
 server/router/middleware/session/user.go                    | 2 +-
 server/router/middleware/store.go                           | 2 +-
 server/router/middleware/token/token.go                     | 2 +-
 server/shared/userSyncer.go                                 | 2 +-
 {store => server/store}/context.go                          | 0
 {store => server/store}/datastore/builds.go                 | 2 +-
 {store => server/store}/datastore/builds_test.go            | 0
 {store => server/store}/datastore/config.go                 | 2 +-
 {store => server/store}/datastore/config_test.go            | 0
 {store => server/store}/datastore/ddl/migrate.go            | 6 +++---
 {store => server/store}/datastore/ddl/mysql/ddl.go          | 0
 {store => server/store}/datastore/ddl/mysql/ddl_gen.go      | 0
 .../datastore/ddl/mysql/files/001_create_table_users.sql    | 0
 .../datastore/ddl/mysql/files/002_create_table_repos.sql    | 0
 .../datastore/ddl/mysql/files/003_create_table_builds.sql   | 0
 .../datastore/ddl/mysql/files/004_create_table_procs.sql    | 0
 .../datastore/ddl/mysql/files/005_create_table_logs.sql     | 0
 .../datastore/ddl/mysql/files/006_create_table_files.sql    | 0
 .../datastore/ddl/mysql/files/007_create_table_secets.sql   | 0
 .../datastore/ddl/mysql/files/008_create_table_registry.sql | 0
 .../datastore/ddl/mysql/files/009_create_table_config.sql   | 0
 .../datastore/ddl/mysql/files/010_create_table_tasks.sql    | 0
 .../datastore/ddl/mysql/files/011_create_table_agents.sql   | 0
 .../datastore/ddl/mysql/files/012_create_table_senders.sql  | 0
 .../ddl/mysql/files/013_add_column_repo_visibility.sql      | 0
 .../datastore/ddl/mysql/files/014_add_column_repo_seq.sql   | 0
 .../ddl/mysql/files/015_add_column_repo_active.sql          | 0
 .../ddl/mysql/files/016_add_column_user_synced.sql          | 0
 .../datastore/ddl/mysql/files/017_create_table_perms.sql    | 0
 .../datastore/ddl/mysql/files/018_add_column_file_pid.sql   | 0
 .../ddl/mysql/files/019_create_table_build_config.sql       | 0
 .../ddl/mysql/files/020_add_column_config_name.sql          | 0
 .../datastore/ddl/mysql/files/021_populate_build_config.sql | 0
 .../datastore/ddl/mysql/files/022_add_task_columns.sql      | 0
 .../ddl/mysql/files/023_add_repo_fallback_column.sql        | 0
 .../ddl/mysql/files/024_add_repo_fallback_column.sql        | 0
 .../ddl/mysql/files/025_add_builds_changed_files_column.sql | 0
 .../ddl/mysql/files/026_drop_repo_fallback_column.sql       | 0
 .../files/027_drop_allow_push_tags_deployments_columns.sql  | 0
 .../028_update_table_set_users_token_and_secret_length.sql  | 0
 {store => server/store}/datastore/ddl/postgres/ddl.go       | 0
 {store => server/store}/datastore/ddl/postgres/ddl_gen.go   | 0
 .../datastore/ddl/postgres/files/001_create_table_users.sql | 0
 .../datastore/ddl/postgres/files/002_create_table_repos.sql | 0
 .../ddl/postgres/files/003_create_table_builds.sql          | 0
 .../datastore/ddl/postgres/files/004_create_table_procs.sql | 0
 .../datastore/ddl/postgres/files/005_create_table_logs.sql  | 0
 .../datastore/ddl/postgres/files/006_create_table_files.sql | 0
 .../ddl/postgres/files/007_create_table_secets.sql          | 0
 .../ddl/postgres/files/008_create_table_registry.sql        | 0
 .../ddl/postgres/files/009_create_table_config.sql          | 0
 .../datastore/ddl/postgres/files/010_create_table_tasks.sql | 0
 .../ddl/postgres/files/011_create_table_agents.sql          | 0
 .../ddl/postgres/files/012_create_table_senders.sql         | 0
 .../ddl/postgres/files/013_add_column_repo_visibility.sql   | 0
 .../ddl/postgres/files/014_add_column_repo_seq.sql          | 0
 .../ddl/postgres/files/015_add_column_repo_active.sql       | 0
 .../ddl/postgres/files/016_add_column_user_synced.sql       | 0
 .../datastore/ddl/postgres/files/017_create_table_perms.sql | 0
 .../ddl/postgres/files/018_add_column_file_pid.sql          | 0
 .../ddl/postgres/files/019_create_table_build_config.sql    | 0
 .../ddl/postgres/files/020_add_column_config_name.sql       | 0
 .../ddl/postgres/files/021_populate_build_config.sql        | 0
 .../datastore/ddl/postgres/files/022_add_task_columns.sql   | 0
 .../ddl/postgres/files/023_add_repo_fallback_column.sql     | 0
 .../ddl/postgres/files/024_add_repo_fallback_column.sql     | 0
 .../postgres/files/025_add_builds_changed_files_column.sql  | 0
 .../ddl/postgres/files/026_drop_repo_fallback_column.sql    | 0
 .../files/027_drop_allow_push_tags_deployments_columns.sql  | 0
 .../028_update_table_set_users_token_and_secret_length.sql  | 0
 {store => server/store}/datastore/ddl/sqlite/ddl.go         | 0
 {store => server/store}/datastore/ddl/sqlite/ddl_gen.go     | 0
 .../datastore/ddl/sqlite/files/001_create_table_users.sql   | 0
 .../datastore/ddl/sqlite/files/002_create_table_repos.sql   | 0
 .../datastore/ddl/sqlite/files/003_create_table_builds.sql  | 0
 .../datastore/ddl/sqlite/files/004_create_table_procs.sql   | 0
 .../datastore/ddl/sqlite/files/005_create_table_logs.sql    | 0
 .../datastore/ddl/sqlite/files/006_create_table_files.sql   | 0
 .../datastore/ddl/sqlite/files/007_create_table_secets.sql  | 0
 .../ddl/sqlite/files/008_create_table_registry.sql          | 0
 .../datastore/ddl/sqlite/files/009_create_table_config.sql  | 0
 .../datastore/ddl/sqlite/files/010_create_table_tasks.sql   | 0
 .../datastore/ddl/sqlite/files/011_create_table_agents.sql  | 0
 .../datastore/ddl/sqlite/files/012_create_table_senders.sql | 0
 .../ddl/sqlite/files/013_add_column_repo_visibility.sql     | 0
 .../datastore/ddl/sqlite/files/014_add_column_repo_seq.sql  | 0
 .../ddl/sqlite/files/015_add_column_repo_active.sql         | 0
 .../ddl/sqlite/files/016_add_column_user_synced.sql         | 0
 .../datastore/ddl/sqlite/files/017_create_table_perms.sql   | 0
 .../datastore/ddl/sqlite/files/018_add_column_file_pid.sql  | 0
 .../ddl/sqlite/files/019_create_table_build_config.sql      | 0
 .../ddl/sqlite/files/020_add_column_config_name.sql         | 0
 .../ddl/sqlite/files/021_populate_build_config.sql          | 0
 .../datastore/ddl/sqlite/files/022_add_task_columns.sql     | 0
 .../ddl/sqlite/files/023_add_repo_fallback_column.sql       | 0
 .../ddl/sqlite/files/024_add_repo_fallback_column.sql       | 0
 .../sqlite/files/025_add_builds_changed_files_column.sql    | 0
 .../ddl/sqlite/files/026_drop_repo_fallback_column.sql      | 0
 .../files/027_drop_allow_push_tags_deployments_columns.sql  | 0
 .../028_update_table_set_users_token_and_secret_length.sql  | 0
 {store => server/store}/datastore/files.go                  | 2 +-
 {store => server/store}/datastore/files_test.go             | 0
 {store => server/store}/datastore/init.go                   | 0
 {store => server/store}/datastore/init_cgo.go               | 0
 {store => server/store}/datastore/logs.go                   | 2 +-
 {store => server/store}/datastore/logs_test.go              | 0
 {store => server/store}/datastore/perms.go                  | 2 +-
 {store => server/store}/datastore/perms_test.go             | 0
 {store => server/store}/datastore/procs.go                  | 2 +-
 {store => server/store}/datastore/procs_test.go             | 0
 {store => server/store}/datastore/registry.go               | 2 +-
 {store => server/store}/datastore/registry_test.go          | 0
 {store => server/store}/datastore/repos.go                  | 2 +-
 {store => server/store}/datastore/repos_test.go             | 0
 {store => server/store}/datastore/secret.go                 | 2 +-
 {store => server/store}/datastore/secret_test.go            | 0
 {store => server/store}/datastore/sender.go                 | 2 +-
 {store => server/store}/datastore/sender_test.go            | 0
 {store => server/store}/datastore/sql/lookup.go             | 6 +++---
 .../store}/datastore/sql/mysql/files/config.sql             | 0
 .../store}/datastore/sql/mysql/files/counts.sql             | 0
 {store => server/store}/datastore/sql/mysql/files/feed.sql  | 0
 {store => server/store}/datastore/sql/mysql/files/files.sql | 0
 {store => server/store}/datastore/sql/mysql/files/logs.sql  | 0
 {store => server/store}/datastore/sql/mysql/files/perms.sql | 0
 {store => server/store}/datastore/sql/mysql/files/procs.sql | 0
 .../store}/datastore/sql/mysql/files/registry.sql           | 0
 {store => server/store}/datastore/sql/mysql/files/repos.sql | 0
 .../store}/datastore/sql/mysql/files/secret.sql             | 0
 .../store}/datastore/sql/mysql/files/sender.sql             | 0
 {store => server/store}/datastore/sql/mysql/files/task.sql  | 0
 {store => server/store}/datastore/sql/mysql/files/users.sql | 0
 {store => server/store}/datastore/sql/mysql/sql.go          | 0
 {store => server/store}/datastore/sql/mysql/sql_gen.go      | 0
 .../store}/datastore/sql/postgres/files/config.sql          | 0
 .../store}/datastore/sql/postgres/files/counts.sql          | 0
 .../store}/datastore/sql/postgres/files/feed.sql            | 0
 .../store}/datastore/sql/postgres/files/files.sql           | 0
 .../store}/datastore/sql/postgres/files/logs.sql            | 0
 .../store}/datastore/sql/postgres/files/perms.sql           | 0
 .../store}/datastore/sql/postgres/files/procs.sql           | 0
 .../store}/datastore/sql/postgres/files/registry.sql        | 0
 .../store}/datastore/sql/postgres/files/repos.sql           | 0
 .../store}/datastore/sql/postgres/files/secret.sql          | 0
 .../store}/datastore/sql/postgres/files/sender.sql          | 0
 .../store}/datastore/sql/postgres/files/tasks.sql           | 0
 .../store}/datastore/sql/postgres/files/users.sql           | 0
 {store => server/store}/datastore/sql/postgres/sql.go       | 0
 {store => server/store}/datastore/sql/postgres/sql_gen.go   | 0
 .../store}/datastore/sql/sqlite/files/config.sql            | 0
 .../store}/datastore/sql/sqlite/files/counts.sql            | 0
 {store => server/store}/datastore/sql/sqlite/files/feed.sql | 0
 .../store}/datastore/sql/sqlite/files/files.sql             | 0
 {store => server/store}/datastore/sql/sqlite/files/logs.sql | 0
 .../store}/datastore/sql/sqlite/files/perms.sql             | 0
 .../store}/datastore/sql/sqlite/files/procs.sql             | 0
 .../store}/datastore/sql/sqlite/files/registry.sql          | 0
 .../store}/datastore/sql/sqlite/files/repos.sql             | 0
 .../store}/datastore/sql/sqlite/files/secret.sql            | 0
 .../store}/datastore/sql/sqlite/files/sender.sql            | 0
 {store => server/store}/datastore/sql/sqlite/files/task.sql | 0
 {store => server/store}/datastore/sql/sqlite/files/user.sql | 0
 {store => server/store}/datastore/sql/sqlite/sql.go         | 0
 {store => server/store}/datastore/sql/sqlite/sql_gen.go     | 0
 {store => server/store}/datastore/store.go                  | 4 ++--
 {store => server/store}/datastore/task.go                   | 2 +-
 {store => server/store}/datastore/task_test.go              | 0
 {store => server/store}/datastore/users.go                  | 2 +-
 {store => server/store}/datastore/users_test.go             | 0
 {store => server/store}/datastore/utils.go                  | 0
 {store => server/store}/store.go                            | 0
 186 files changed, 42 insertions(+), 43 deletions(-)
 rename {store => server/store}/context.go (100%)
 rename {store => server/store}/datastore/builds.go (98%)
 rename {store => server/store}/datastore/builds_test.go (100%)
 rename {store => server/store}/datastore/config.go (96%)
 rename {store => server/store}/datastore/config_test.go (100%)
 rename {store => server/store}/datastore/ddl/migrate.go (92%)
 rename {store => server/store}/datastore/ddl/mysql/ddl.go (100%)
 rename {store => server/store}/datastore/ddl/mysql/ddl_gen.go (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/001_create_table_users.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/002_create_table_repos.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/003_create_table_builds.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/004_create_table_procs.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/005_create_table_logs.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/006_create_table_files.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/007_create_table_secets.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/008_create_table_registry.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/009_create_table_config.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/010_create_table_tasks.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/011_create_table_agents.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/012_create_table_senders.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/013_add_column_repo_visibility.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/014_add_column_repo_seq.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/015_add_column_repo_active.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/016_add_column_user_synced.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/017_create_table_perms.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/018_add_column_file_pid.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/019_create_table_build_config.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/020_add_column_config_name.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/021_populate_build_config.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/022_add_task_columns.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/023_add_repo_fallback_column.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/024_add_repo_fallback_column.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/025_add_builds_changed_files_column.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/026_drop_repo_fallback_column.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/027_drop_allow_push_tags_deployments_columns.sql (100%)
 rename {store => server/store}/datastore/ddl/mysql/files/028_update_table_set_users_token_and_secret_length.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/ddl.go (100%)
 rename {store => server/store}/datastore/ddl/postgres/ddl_gen.go (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/001_create_table_users.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/002_create_table_repos.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/003_create_table_builds.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/004_create_table_procs.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/005_create_table_logs.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/006_create_table_files.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/007_create_table_secets.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/008_create_table_registry.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/009_create_table_config.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/010_create_table_tasks.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/011_create_table_agents.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/012_create_table_senders.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/013_add_column_repo_visibility.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/014_add_column_repo_seq.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/015_add_column_repo_active.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/016_add_column_user_synced.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/017_create_table_perms.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/018_add_column_file_pid.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/019_create_table_build_config.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/020_add_column_config_name.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/021_populate_build_config.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/022_add_task_columns.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/023_add_repo_fallback_column.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/024_add_repo_fallback_column.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/025_add_builds_changed_files_column.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/026_drop_repo_fallback_column.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/027_drop_allow_push_tags_deployments_columns.sql (100%)
 rename {store => server/store}/datastore/ddl/postgres/files/028_update_table_set_users_token_and_secret_length.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/ddl.go (100%)
 rename {store => server/store}/datastore/ddl/sqlite/ddl_gen.go (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/001_create_table_users.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/002_create_table_repos.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/003_create_table_builds.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/004_create_table_procs.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/005_create_table_logs.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/006_create_table_files.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/007_create_table_secets.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/008_create_table_registry.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/009_create_table_config.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/010_create_table_tasks.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/011_create_table_agents.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/012_create_table_senders.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/013_add_column_repo_visibility.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/014_add_column_repo_seq.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/015_add_column_repo_active.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/016_add_column_user_synced.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/017_create_table_perms.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/018_add_column_file_pid.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/019_create_table_build_config.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/020_add_column_config_name.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/021_populate_build_config.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/022_add_task_columns.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/023_add_repo_fallback_column.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/024_add_repo_fallback_column.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/025_add_builds_changed_files_column.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/026_drop_repo_fallback_column.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/027_drop_allow_push_tags_deployments_columns.sql (100%)
 rename {store => server/store}/datastore/ddl/sqlite/files/028_update_table_set_users_token_and_secret_length.sql (100%)
 rename {store => server/store}/datastore/files.go (97%)
 rename {store => server/store}/datastore/files_test.go (100%)
 rename {store => server/store}/datastore/init.go (100%)
 rename {store => server/store}/datastore/init_cgo.go (100%)
 rename {store => server/store}/datastore/logs.go (95%)
 rename {store => server/store}/datastore/logs_test.go (100%)
 rename {store => server/store}/datastore/perms.go (96%)
 rename {store => server/store}/datastore/perms_test.go (100%)
 rename {store => server/store}/datastore/procs.go (97%)
 rename {store => server/store}/datastore/procs_test.go (100%)
 rename {store => server/store}/datastore/registry.go (96%)
 rename {store => server/store}/datastore/registry_test.go (100%)
 rename {store => server/store}/datastore/repos.go (97%)
 rename {store => server/store}/datastore/repos_test.go (100%)
 rename {store => server/store}/datastore/secret.go (95%)
 rename {store => server/store}/datastore/secret_test.go (100%)
 rename {store => server/store}/datastore/sender.go (95%)
 rename {store => server/store}/datastore/sender_test.go (100%)
 rename {store => server/store}/datastore/sql/lookup.go (82%)
 rename {store => server/store}/datastore/sql/mysql/files/config.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/counts.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/feed.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/files.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/logs.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/perms.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/procs.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/registry.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/repos.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/secret.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/sender.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/task.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/files/users.sql (100%)
 rename {store => server/store}/datastore/sql/mysql/sql.go (100%)
 rename {store => server/store}/datastore/sql/mysql/sql_gen.go (100%)
 rename {store => server/store}/datastore/sql/postgres/files/config.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/counts.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/feed.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/files.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/logs.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/perms.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/procs.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/registry.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/repos.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/secret.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/sender.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/tasks.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/files/users.sql (100%)
 rename {store => server/store}/datastore/sql/postgres/sql.go (100%)
 rename {store => server/store}/datastore/sql/postgres/sql_gen.go (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/config.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/counts.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/feed.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/files.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/logs.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/perms.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/procs.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/registry.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/repos.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/secret.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/sender.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/task.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/files/user.sql (100%)
 rename {store => server/store}/datastore/sql/sqlite/sql.go (100%)
 rename {store => server/store}/datastore/sql/sqlite/sql_gen.go (100%)
 rename {store => server/store}/datastore/store.go (96%)
 rename {store => server/store}/datastore/task.go (94%)
 rename {store => server/store}/datastore/task_test.go (100%)
 rename {store => server/store}/datastore/users.go (96%)
 rename {store => server/store}/datastore/users_test.go (100%)
 rename {store => server/store}/datastore/utils.go (100%)
 rename {store => server/store}/store.go (100%)

diff --git a/.woodpecker/main.yml b/.woodpecker/main.yml
index 646abb28e..420c52613 100644
--- a/.woodpecker/main.yml
+++ b/.woodpecker/main.yml
@@ -27,7 +27,7 @@ pipeline:
       - DATABASE_DRIVER=postgres
       - DATABASE_CONFIG=host=postgres user=postgres dbname=postgres sslmode=disable
     commands:
-      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/store/datastore
+      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/server/store/datastore
 
   test-mysql:
     image: golang:1.16
@@ -36,7 +36,7 @@ pipeline:
       - DATABASE_DRIVER=mysql
       - DATABASE_CONFIG=root@tcp(mysql:3306)/test?parseTime=true
     commands:
-      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/store/datastore
+      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/server/store/datastore
 
   build-frontend:
     image: node:10.17.0-stretch
diff --git a/cmd/server/server.go b/cmd/server/server.go
index a0ae92ea9..0cc4fa6ee 100644
--- a/cmd/server/server.go
+++ b/cmd/server/server.go
@@ -42,7 +42,7 @@ import (
 	woodpeckerGrpcServer "github.com/woodpecker-ci/woodpecker/server/grpc"
 	"github.com/woodpecker-ci/woodpecker/server/router"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/contrib/ginrus"
 	"github.com/sirupsen/logrus"
diff --git a/cmd/server/setup.go b/cmd/server/setup.go
index e4b06d1f3..774f31240 100644
--- a/cmd/server/setup.go
+++ b/cmd/server/setup.go
@@ -36,9 +36,9 @@ import (
 	"github.com/woodpecker-ci/woodpecker/remote/gitlab3"
 	"github.com/woodpecker-ci/woodpecker/remote/gogs"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/store"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore"
 	"github.com/woodpecker-ci/woodpecker/server/web"
-	"github.com/woodpecker-ci/woodpecker/store"
-	"github.com/woodpecker-ci/woodpecker/store/datastore"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/urfave/cli"
diff --git a/server/api/badge.go b/server/api/badge.go
index 522e4dfbb..701277103 100644
--- a/server/api/badge.go
+++ b/server/api/badge.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/server"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 var (
diff --git a/server/api/build.go b/server/api/build.go
index a87c4c724..19660e677 100644
--- a/server/api/build.go
+++ b/server/api/build.go
@@ -30,13 +30,12 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 	"github.com/woodpecker-ci/woodpecker/cncd/queue"
-	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/store"
-
 	"github.com/woodpecker-ci/woodpecker/model"
+	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 func GetBuilds(c *gin.Context) {
diff --git a/server/api/file.go b/server/api/file.go
index 4f0e2856c..2a803e966 100644
--- a/server/api/file.go
+++ b/server/api/file.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 // FileList gets a list file by build.
diff --git a/server/api/hook.go b/server/api/hook.go
index 372e86053..12d9844ff 100644
--- a/server/api/hook.go
+++ b/server/api/hook.go
@@ -34,7 +34,6 @@ import (
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 
 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc"
@@ -42,6 +41,7 @@ import (
 	"github.com/woodpecker-ci/woodpecker/cncd/queue"
 	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 var skipRe = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`)
diff --git a/server/api/login.go b/server/api/login.go
index f455869d9..221640fe7 100644
--- a/server/api/login.go
+++ b/server/api/login.go
@@ -23,9 +23,9 @@ import (
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/httputil"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
diff --git a/server/api/repo.go b/server/api/repo.go
index 460169c51..c2331d921 100644
--- a/server/api/repo.go
+++ b/server/api/repo.go
@@ -27,8 +27,8 @@ import (
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 )
 
 func PostRepo(c *gin.Context) {
diff --git a/server/api/stream.go b/server/api/stream.go
index 69d18456a..b57aa60a3 100644
--- a/server/api/stream.go
+++ b/server/api/stream.go
@@ -27,7 +27,7 @@ import (
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
diff --git a/server/api/user.go b/server/api/user.go
index 7966ce997..9c7fe7c1d 100644
--- a/server/api/user.go
+++ b/server/api/user.go
@@ -28,8 +28,8 @@ import (
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 )
 
 func GetSelf(c *gin.Context) {
diff --git a/server/api/users.go b/server/api/users.go
index 85ef49b32..99c51b73c 100644
--- a/server/api/users.go
+++ b/server/api/users.go
@@ -22,7 +22,7 @@ import (
 	"github.com/gorilla/securecookie"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 func GetUsers(c *gin.Context) {
diff --git a/server/api/z.go b/server/api/z.go
index e74a829da..a74e27d57 100644
--- a/server/api/z.go
+++ b/server/api/z.go
@@ -16,7 +16,7 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/version"
 )
 
diff --git a/server/grpc/rpc.go b/server/grpc/rpc.go
index 3dfceab7e..a2c64353d 100644
--- a/server/grpc/rpc.go
+++ b/server/grpc/rpc.go
@@ -42,7 +42,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/woodpecker-ci/expr"
 )
diff --git a/server/router/middleware/session/repo.go b/server/router/middleware/session/repo.go
index 2f5fcf17b..8bf91456d 100644
--- a/server/router/middleware/session/repo.go
+++ b/server/router/middleware/session/repo.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
diff --git a/server/router/middleware/session/user.go b/server/router/middleware/session/user.go
index f036d8211..64aa9f471 100644
--- a/server/router/middleware/session/user.go
+++ b/server/router/middleware/session/user.go
@@ -18,8 +18,8 @@ import (
 	"net/http"
 
 	"github.com/woodpecker-ci/woodpecker/model"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 
 	"github.com/gin-gonic/gin"
 )
diff --git a/server/router/middleware/store.go b/server/router/middleware/store.go
index 3028e2a1b..6c38281ba 100644
--- a/server/router/middleware/store.go
+++ b/server/router/middleware/store.go
@@ -16,7 +16,7 @@ package middleware
 
 import (
 	"github.com/urfave/cli"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/gin"
 )
diff --git a/server/router/middleware/token/token.go b/server/router/middleware/token/token.go
index c601ab7a8..42d735fe3 100644
--- a/server/router/middleware/token/token.go
+++ b/server/router/middleware/token/token.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
diff --git a/server/shared/userSyncer.go b/server/shared/userSyncer.go
index c31f0cfc9..753696ac4 100644
--- a/server/shared/userSyncer.go
+++ b/server/shared/userSyncer.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 // UserSyncer syncs the user repository and permissions.
diff --git a/store/context.go b/server/store/context.go
similarity index 100%
rename from store/context.go
rename to server/store/context.go
diff --git a/store/datastore/builds.go b/server/store/datastore/builds.go
similarity index 98%
rename from store/datastore/builds.go
rename to server/store/datastore/builds.go
index dedfa56b5..a9ee44c54 100644
--- a/store/datastore/builds.go
+++ b/server/store/datastore/builds.go
@@ -20,7 +20,7 @@ import (
 
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) GetBuild(id int64) (*model.Build, error) {
diff --git a/store/datastore/builds_test.go b/server/store/datastore/builds_test.go
similarity index 100%
rename from store/datastore/builds_test.go
rename to server/store/datastore/builds_test.go
diff --git a/store/datastore/config.go b/server/store/datastore/config.go
similarity index 96%
rename from store/datastore/config.go
rename to server/store/datastore/config.go
index 4c974c555..88c72a0e9 100644
--- a/store/datastore/config.go
+++ b/server/store/datastore/config.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) ConfigsForBuild(buildID int64) ([]*model.Config, error) {
diff --git a/store/datastore/config_test.go b/server/store/datastore/config_test.go
similarity index 100%
rename from store/datastore/config_test.go
rename to server/store/datastore/config_test.go
diff --git a/store/datastore/ddl/migrate.go b/server/store/datastore/ddl/migrate.go
similarity index 92%
rename from store/datastore/ddl/migrate.go
rename to server/store/datastore/ddl/migrate.go
index cbef1e184..d93ed13f6 100644
--- a/store/datastore/ddl/migrate.go
+++ b/server/store/datastore/ddl/migrate.go
@@ -18,9 +18,9 @@ import (
 	"database/sql"
 	"errors"
 
-	"github.com/woodpecker-ci/woodpecker/store/datastore/ddl/mysql"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/ddl/postgres"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/ddl/sqlite"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/ddl/mysql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/ddl/postgres"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/ddl/sqlite"
 )
 
 // Supported database drivers
diff --git a/store/datastore/ddl/mysql/ddl.go b/server/store/datastore/ddl/mysql/ddl.go
similarity index 100%
rename from store/datastore/ddl/mysql/ddl.go
rename to server/store/datastore/ddl/mysql/ddl.go
diff --git a/store/datastore/ddl/mysql/ddl_gen.go b/server/store/datastore/ddl/mysql/ddl_gen.go
similarity index 100%
rename from store/datastore/ddl/mysql/ddl_gen.go
rename to server/store/datastore/ddl/mysql/ddl_gen.go
diff --git a/store/datastore/ddl/mysql/files/001_create_table_users.sql b/server/store/datastore/ddl/mysql/files/001_create_table_users.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/001_create_table_users.sql
rename to server/store/datastore/ddl/mysql/files/001_create_table_users.sql
diff --git a/store/datastore/ddl/mysql/files/002_create_table_repos.sql b/server/store/datastore/ddl/mysql/files/002_create_table_repos.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/002_create_table_repos.sql
rename to server/store/datastore/ddl/mysql/files/002_create_table_repos.sql
diff --git a/store/datastore/ddl/mysql/files/003_create_table_builds.sql b/server/store/datastore/ddl/mysql/files/003_create_table_builds.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/003_create_table_builds.sql
rename to server/store/datastore/ddl/mysql/files/003_create_table_builds.sql
diff --git a/store/datastore/ddl/mysql/files/004_create_table_procs.sql b/server/store/datastore/ddl/mysql/files/004_create_table_procs.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/004_create_table_procs.sql
rename to server/store/datastore/ddl/mysql/files/004_create_table_procs.sql
diff --git a/store/datastore/ddl/mysql/files/005_create_table_logs.sql b/server/store/datastore/ddl/mysql/files/005_create_table_logs.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/005_create_table_logs.sql
rename to server/store/datastore/ddl/mysql/files/005_create_table_logs.sql
diff --git a/store/datastore/ddl/mysql/files/006_create_table_files.sql b/server/store/datastore/ddl/mysql/files/006_create_table_files.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/006_create_table_files.sql
rename to server/store/datastore/ddl/mysql/files/006_create_table_files.sql
diff --git a/store/datastore/ddl/mysql/files/007_create_table_secets.sql b/server/store/datastore/ddl/mysql/files/007_create_table_secets.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/007_create_table_secets.sql
rename to server/store/datastore/ddl/mysql/files/007_create_table_secets.sql
diff --git a/store/datastore/ddl/mysql/files/008_create_table_registry.sql b/server/store/datastore/ddl/mysql/files/008_create_table_registry.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/008_create_table_registry.sql
rename to server/store/datastore/ddl/mysql/files/008_create_table_registry.sql
diff --git a/store/datastore/ddl/mysql/files/009_create_table_config.sql b/server/store/datastore/ddl/mysql/files/009_create_table_config.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/009_create_table_config.sql
rename to server/store/datastore/ddl/mysql/files/009_create_table_config.sql
diff --git a/store/datastore/ddl/mysql/files/010_create_table_tasks.sql b/server/store/datastore/ddl/mysql/files/010_create_table_tasks.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/010_create_table_tasks.sql
rename to server/store/datastore/ddl/mysql/files/010_create_table_tasks.sql
diff --git a/store/datastore/ddl/mysql/files/011_create_table_agents.sql b/server/store/datastore/ddl/mysql/files/011_create_table_agents.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/011_create_table_agents.sql
rename to server/store/datastore/ddl/mysql/files/011_create_table_agents.sql
diff --git a/store/datastore/ddl/mysql/files/012_create_table_senders.sql b/server/store/datastore/ddl/mysql/files/012_create_table_senders.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/012_create_table_senders.sql
rename to server/store/datastore/ddl/mysql/files/012_create_table_senders.sql
diff --git a/store/datastore/ddl/mysql/files/013_add_column_repo_visibility.sql b/server/store/datastore/ddl/mysql/files/013_add_column_repo_visibility.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/013_add_column_repo_visibility.sql
rename to server/store/datastore/ddl/mysql/files/013_add_column_repo_visibility.sql
diff --git a/store/datastore/ddl/mysql/files/014_add_column_repo_seq.sql b/server/store/datastore/ddl/mysql/files/014_add_column_repo_seq.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/014_add_column_repo_seq.sql
rename to server/store/datastore/ddl/mysql/files/014_add_column_repo_seq.sql
diff --git a/store/datastore/ddl/mysql/files/015_add_column_repo_active.sql b/server/store/datastore/ddl/mysql/files/015_add_column_repo_active.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/015_add_column_repo_active.sql
rename to server/store/datastore/ddl/mysql/files/015_add_column_repo_active.sql
diff --git a/store/datastore/ddl/mysql/files/016_add_column_user_synced.sql b/server/store/datastore/ddl/mysql/files/016_add_column_user_synced.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/016_add_column_user_synced.sql
rename to server/store/datastore/ddl/mysql/files/016_add_column_user_synced.sql
diff --git a/store/datastore/ddl/mysql/files/017_create_table_perms.sql b/server/store/datastore/ddl/mysql/files/017_create_table_perms.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/017_create_table_perms.sql
rename to server/store/datastore/ddl/mysql/files/017_create_table_perms.sql
diff --git a/store/datastore/ddl/mysql/files/018_add_column_file_pid.sql b/server/store/datastore/ddl/mysql/files/018_add_column_file_pid.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/018_add_column_file_pid.sql
rename to server/store/datastore/ddl/mysql/files/018_add_column_file_pid.sql
diff --git a/store/datastore/ddl/mysql/files/019_create_table_build_config.sql b/server/store/datastore/ddl/mysql/files/019_create_table_build_config.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/019_create_table_build_config.sql
rename to server/store/datastore/ddl/mysql/files/019_create_table_build_config.sql
diff --git a/store/datastore/ddl/mysql/files/020_add_column_config_name.sql b/server/store/datastore/ddl/mysql/files/020_add_column_config_name.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/020_add_column_config_name.sql
rename to server/store/datastore/ddl/mysql/files/020_add_column_config_name.sql
diff --git a/store/datastore/ddl/mysql/files/021_populate_build_config.sql b/server/store/datastore/ddl/mysql/files/021_populate_build_config.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/021_populate_build_config.sql
rename to server/store/datastore/ddl/mysql/files/021_populate_build_config.sql
diff --git a/store/datastore/ddl/mysql/files/022_add_task_columns.sql b/server/store/datastore/ddl/mysql/files/022_add_task_columns.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/022_add_task_columns.sql
rename to server/store/datastore/ddl/mysql/files/022_add_task_columns.sql
diff --git a/store/datastore/ddl/mysql/files/023_add_repo_fallback_column.sql b/server/store/datastore/ddl/mysql/files/023_add_repo_fallback_column.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/023_add_repo_fallback_column.sql
rename to server/store/datastore/ddl/mysql/files/023_add_repo_fallback_column.sql
diff --git a/store/datastore/ddl/mysql/files/024_add_repo_fallback_column.sql b/server/store/datastore/ddl/mysql/files/024_add_repo_fallback_column.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/024_add_repo_fallback_column.sql
rename to server/store/datastore/ddl/mysql/files/024_add_repo_fallback_column.sql
diff --git a/store/datastore/ddl/mysql/files/025_add_builds_changed_files_column.sql b/server/store/datastore/ddl/mysql/files/025_add_builds_changed_files_column.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/025_add_builds_changed_files_column.sql
rename to server/store/datastore/ddl/mysql/files/025_add_builds_changed_files_column.sql
diff --git a/store/datastore/ddl/mysql/files/026_drop_repo_fallback_column.sql b/server/store/datastore/ddl/mysql/files/026_drop_repo_fallback_column.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/026_drop_repo_fallback_column.sql
rename to server/store/datastore/ddl/mysql/files/026_drop_repo_fallback_column.sql
diff --git a/store/datastore/ddl/mysql/files/027_drop_allow_push_tags_deployments_columns.sql b/server/store/datastore/ddl/mysql/files/027_drop_allow_push_tags_deployments_columns.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/027_drop_allow_push_tags_deployments_columns.sql
rename to server/store/datastore/ddl/mysql/files/027_drop_allow_push_tags_deployments_columns.sql
diff --git a/store/datastore/ddl/mysql/files/028_update_table_set_users_token_and_secret_length.sql b/server/store/datastore/ddl/mysql/files/028_update_table_set_users_token_and_secret_length.sql
similarity index 100%
rename from store/datastore/ddl/mysql/files/028_update_table_set_users_token_and_secret_length.sql
rename to server/store/datastore/ddl/mysql/files/028_update_table_set_users_token_and_secret_length.sql
diff --git a/store/datastore/ddl/postgres/ddl.go b/server/store/datastore/ddl/postgres/ddl.go
similarity index 100%
rename from store/datastore/ddl/postgres/ddl.go
rename to server/store/datastore/ddl/postgres/ddl.go
diff --git a/store/datastore/ddl/postgres/ddl_gen.go b/server/store/datastore/ddl/postgres/ddl_gen.go
similarity index 100%
rename from store/datastore/ddl/postgres/ddl_gen.go
rename to server/store/datastore/ddl/postgres/ddl_gen.go
diff --git a/store/datastore/ddl/postgres/files/001_create_table_users.sql b/server/store/datastore/ddl/postgres/files/001_create_table_users.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/001_create_table_users.sql
rename to server/store/datastore/ddl/postgres/files/001_create_table_users.sql
diff --git a/store/datastore/ddl/postgres/files/002_create_table_repos.sql b/server/store/datastore/ddl/postgres/files/002_create_table_repos.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/002_create_table_repos.sql
rename to server/store/datastore/ddl/postgres/files/002_create_table_repos.sql
diff --git a/store/datastore/ddl/postgres/files/003_create_table_builds.sql b/server/store/datastore/ddl/postgres/files/003_create_table_builds.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/003_create_table_builds.sql
rename to server/store/datastore/ddl/postgres/files/003_create_table_builds.sql
diff --git a/store/datastore/ddl/postgres/files/004_create_table_procs.sql b/server/store/datastore/ddl/postgres/files/004_create_table_procs.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/004_create_table_procs.sql
rename to server/store/datastore/ddl/postgres/files/004_create_table_procs.sql
diff --git a/store/datastore/ddl/postgres/files/005_create_table_logs.sql b/server/store/datastore/ddl/postgres/files/005_create_table_logs.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/005_create_table_logs.sql
rename to server/store/datastore/ddl/postgres/files/005_create_table_logs.sql
diff --git a/store/datastore/ddl/postgres/files/006_create_table_files.sql b/server/store/datastore/ddl/postgres/files/006_create_table_files.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/006_create_table_files.sql
rename to server/store/datastore/ddl/postgres/files/006_create_table_files.sql
diff --git a/store/datastore/ddl/postgres/files/007_create_table_secets.sql b/server/store/datastore/ddl/postgres/files/007_create_table_secets.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/007_create_table_secets.sql
rename to server/store/datastore/ddl/postgres/files/007_create_table_secets.sql
diff --git a/store/datastore/ddl/postgres/files/008_create_table_registry.sql b/server/store/datastore/ddl/postgres/files/008_create_table_registry.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/008_create_table_registry.sql
rename to server/store/datastore/ddl/postgres/files/008_create_table_registry.sql
diff --git a/store/datastore/ddl/postgres/files/009_create_table_config.sql b/server/store/datastore/ddl/postgres/files/009_create_table_config.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/009_create_table_config.sql
rename to server/store/datastore/ddl/postgres/files/009_create_table_config.sql
diff --git a/store/datastore/ddl/postgres/files/010_create_table_tasks.sql b/server/store/datastore/ddl/postgres/files/010_create_table_tasks.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/010_create_table_tasks.sql
rename to server/store/datastore/ddl/postgres/files/010_create_table_tasks.sql
diff --git a/store/datastore/ddl/postgres/files/011_create_table_agents.sql b/server/store/datastore/ddl/postgres/files/011_create_table_agents.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/011_create_table_agents.sql
rename to server/store/datastore/ddl/postgres/files/011_create_table_agents.sql
diff --git a/store/datastore/ddl/postgres/files/012_create_table_senders.sql b/server/store/datastore/ddl/postgres/files/012_create_table_senders.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/012_create_table_senders.sql
rename to server/store/datastore/ddl/postgres/files/012_create_table_senders.sql
diff --git a/store/datastore/ddl/postgres/files/013_add_column_repo_visibility.sql b/server/store/datastore/ddl/postgres/files/013_add_column_repo_visibility.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/013_add_column_repo_visibility.sql
rename to server/store/datastore/ddl/postgres/files/013_add_column_repo_visibility.sql
diff --git a/store/datastore/ddl/postgres/files/014_add_column_repo_seq.sql b/server/store/datastore/ddl/postgres/files/014_add_column_repo_seq.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/014_add_column_repo_seq.sql
rename to server/store/datastore/ddl/postgres/files/014_add_column_repo_seq.sql
diff --git a/store/datastore/ddl/postgres/files/015_add_column_repo_active.sql b/server/store/datastore/ddl/postgres/files/015_add_column_repo_active.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/015_add_column_repo_active.sql
rename to server/store/datastore/ddl/postgres/files/015_add_column_repo_active.sql
diff --git a/store/datastore/ddl/postgres/files/016_add_column_user_synced.sql b/server/store/datastore/ddl/postgres/files/016_add_column_user_synced.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/016_add_column_user_synced.sql
rename to server/store/datastore/ddl/postgres/files/016_add_column_user_synced.sql
diff --git a/store/datastore/ddl/postgres/files/017_create_table_perms.sql b/server/store/datastore/ddl/postgres/files/017_create_table_perms.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/017_create_table_perms.sql
rename to server/store/datastore/ddl/postgres/files/017_create_table_perms.sql
diff --git a/store/datastore/ddl/postgres/files/018_add_column_file_pid.sql b/server/store/datastore/ddl/postgres/files/018_add_column_file_pid.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/018_add_column_file_pid.sql
rename to server/store/datastore/ddl/postgres/files/018_add_column_file_pid.sql
diff --git a/store/datastore/ddl/postgres/files/019_create_table_build_config.sql b/server/store/datastore/ddl/postgres/files/019_create_table_build_config.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/019_create_table_build_config.sql
rename to server/store/datastore/ddl/postgres/files/019_create_table_build_config.sql
diff --git a/store/datastore/ddl/postgres/files/020_add_column_config_name.sql b/server/store/datastore/ddl/postgres/files/020_add_column_config_name.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/020_add_column_config_name.sql
rename to server/store/datastore/ddl/postgres/files/020_add_column_config_name.sql
diff --git a/store/datastore/ddl/postgres/files/021_populate_build_config.sql b/server/store/datastore/ddl/postgres/files/021_populate_build_config.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/021_populate_build_config.sql
rename to server/store/datastore/ddl/postgres/files/021_populate_build_config.sql
diff --git a/store/datastore/ddl/postgres/files/022_add_task_columns.sql b/server/store/datastore/ddl/postgres/files/022_add_task_columns.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/022_add_task_columns.sql
rename to server/store/datastore/ddl/postgres/files/022_add_task_columns.sql
diff --git a/store/datastore/ddl/postgres/files/023_add_repo_fallback_column.sql b/server/store/datastore/ddl/postgres/files/023_add_repo_fallback_column.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/023_add_repo_fallback_column.sql
rename to server/store/datastore/ddl/postgres/files/023_add_repo_fallback_column.sql
diff --git a/store/datastore/ddl/postgres/files/024_add_repo_fallback_column.sql b/server/store/datastore/ddl/postgres/files/024_add_repo_fallback_column.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/024_add_repo_fallback_column.sql
rename to server/store/datastore/ddl/postgres/files/024_add_repo_fallback_column.sql
diff --git a/store/datastore/ddl/postgres/files/025_add_builds_changed_files_column.sql b/server/store/datastore/ddl/postgres/files/025_add_builds_changed_files_column.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/025_add_builds_changed_files_column.sql
rename to server/store/datastore/ddl/postgres/files/025_add_builds_changed_files_column.sql
diff --git a/store/datastore/ddl/postgres/files/026_drop_repo_fallback_column.sql b/server/store/datastore/ddl/postgres/files/026_drop_repo_fallback_column.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/026_drop_repo_fallback_column.sql
rename to server/store/datastore/ddl/postgres/files/026_drop_repo_fallback_column.sql
diff --git a/store/datastore/ddl/postgres/files/027_drop_allow_push_tags_deployments_columns.sql b/server/store/datastore/ddl/postgres/files/027_drop_allow_push_tags_deployments_columns.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/027_drop_allow_push_tags_deployments_columns.sql
rename to server/store/datastore/ddl/postgres/files/027_drop_allow_push_tags_deployments_columns.sql
diff --git a/store/datastore/ddl/postgres/files/028_update_table_set_users_token_and_secret_length.sql b/server/store/datastore/ddl/postgres/files/028_update_table_set_users_token_and_secret_length.sql
similarity index 100%
rename from store/datastore/ddl/postgres/files/028_update_table_set_users_token_and_secret_length.sql
rename to server/store/datastore/ddl/postgres/files/028_update_table_set_users_token_and_secret_length.sql
diff --git a/store/datastore/ddl/sqlite/ddl.go b/server/store/datastore/ddl/sqlite/ddl.go
similarity index 100%
rename from store/datastore/ddl/sqlite/ddl.go
rename to server/store/datastore/ddl/sqlite/ddl.go
diff --git a/store/datastore/ddl/sqlite/ddl_gen.go b/server/store/datastore/ddl/sqlite/ddl_gen.go
similarity index 100%
rename from store/datastore/ddl/sqlite/ddl_gen.go
rename to server/store/datastore/ddl/sqlite/ddl_gen.go
diff --git a/store/datastore/ddl/sqlite/files/001_create_table_users.sql b/server/store/datastore/ddl/sqlite/files/001_create_table_users.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/001_create_table_users.sql
rename to server/store/datastore/ddl/sqlite/files/001_create_table_users.sql
diff --git a/store/datastore/ddl/sqlite/files/002_create_table_repos.sql b/server/store/datastore/ddl/sqlite/files/002_create_table_repos.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/002_create_table_repos.sql
rename to server/store/datastore/ddl/sqlite/files/002_create_table_repos.sql
diff --git a/store/datastore/ddl/sqlite/files/003_create_table_builds.sql b/server/store/datastore/ddl/sqlite/files/003_create_table_builds.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/003_create_table_builds.sql
rename to server/store/datastore/ddl/sqlite/files/003_create_table_builds.sql
diff --git a/store/datastore/ddl/sqlite/files/004_create_table_procs.sql b/server/store/datastore/ddl/sqlite/files/004_create_table_procs.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/004_create_table_procs.sql
rename to server/store/datastore/ddl/sqlite/files/004_create_table_procs.sql
diff --git a/store/datastore/ddl/sqlite/files/005_create_table_logs.sql b/server/store/datastore/ddl/sqlite/files/005_create_table_logs.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/005_create_table_logs.sql
rename to server/store/datastore/ddl/sqlite/files/005_create_table_logs.sql
diff --git a/store/datastore/ddl/sqlite/files/006_create_table_files.sql b/server/store/datastore/ddl/sqlite/files/006_create_table_files.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/006_create_table_files.sql
rename to server/store/datastore/ddl/sqlite/files/006_create_table_files.sql
diff --git a/store/datastore/ddl/sqlite/files/007_create_table_secets.sql b/server/store/datastore/ddl/sqlite/files/007_create_table_secets.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/007_create_table_secets.sql
rename to server/store/datastore/ddl/sqlite/files/007_create_table_secets.sql
diff --git a/store/datastore/ddl/sqlite/files/008_create_table_registry.sql b/server/store/datastore/ddl/sqlite/files/008_create_table_registry.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/008_create_table_registry.sql
rename to server/store/datastore/ddl/sqlite/files/008_create_table_registry.sql
diff --git a/store/datastore/ddl/sqlite/files/009_create_table_config.sql b/server/store/datastore/ddl/sqlite/files/009_create_table_config.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/009_create_table_config.sql
rename to server/store/datastore/ddl/sqlite/files/009_create_table_config.sql
diff --git a/store/datastore/ddl/sqlite/files/010_create_table_tasks.sql b/server/store/datastore/ddl/sqlite/files/010_create_table_tasks.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/010_create_table_tasks.sql
rename to server/store/datastore/ddl/sqlite/files/010_create_table_tasks.sql
diff --git a/store/datastore/ddl/sqlite/files/011_create_table_agents.sql b/server/store/datastore/ddl/sqlite/files/011_create_table_agents.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/011_create_table_agents.sql
rename to server/store/datastore/ddl/sqlite/files/011_create_table_agents.sql
diff --git a/store/datastore/ddl/sqlite/files/012_create_table_senders.sql b/server/store/datastore/ddl/sqlite/files/012_create_table_senders.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/012_create_table_senders.sql
rename to server/store/datastore/ddl/sqlite/files/012_create_table_senders.sql
diff --git a/store/datastore/ddl/sqlite/files/013_add_column_repo_visibility.sql b/server/store/datastore/ddl/sqlite/files/013_add_column_repo_visibility.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/013_add_column_repo_visibility.sql
rename to server/store/datastore/ddl/sqlite/files/013_add_column_repo_visibility.sql
diff --git a/store/datastore/ddl/sqlite/files/014_add_column_repo_seq.sql b/server/store/datastore/ddl/sqlite/files/014_add_column_repo_seq.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/014_add_column_repo_seq.sql
rename to server/store/datastore/ddl/sqlite/files/014_add_column_repo_seq.sql
diff --git a/store/datastore/ddl/sqlite/files/015_add_column_repo_active.sql b/server/store/datastore/ddl/sqlite/files/015_add_column_repo_active.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/015_add_column_repo_active.sql
rename to server/store/datastore/ddl/sqlite/files/015_add_column_repo_active.sql
diff --git a/store/datastore/ddl/sqlite/files/016_add_column_user_synced.sql b/server/store/datastore/ddl/sqlite/files/016_add_column_user_synced.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/016_add_column_user_synced.sql
rename to server/store/datastore/ddl/sqlite/files/016_add_column_user_synced.sql
diff --git a/store/datastore/ddl/sqlite/files/017_create_table_perms.sql b/server/store/datastore/ddl/sqlite/files/017_create_table_perms.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/017_create_table_perms.sql
rename to server/store/datastore/ddl/sqlite/files/017_create_table_perms.sql
diff --git a/store/datastore/ddl/sqlite/files/018_add_column_file_pid.sql b/server/store/datastore/ddl/sqlite/files/018_add_column_file_pid.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/018_add_column_file_pid.sql
rename to server/store/datastore/ddl/sqlite/files/018_add_column_file_pid.sql
diff --git a/store/datastore/ddl/sqlite/files/019_create_table_build_config.sql b/server/store/datastore/ddl/sqlite/files/019_create_table_build_config.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/019_create_table_build_config.sql
rename to server/store/datastore/ddl/sqlite/files/019_create_table_build_config.sql
diff --git a/store/datastore/ddl/sqlite/files/020_add_column_config_name.sql b/server/store/datastore/ddl/sqlite/files/020_add_column_config_name.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/020_add_column_config_name.sql
rename to server/store/datastore/ddl/sqlite/files/020_add_column_config_name.sql
diff --git a/store/datastore/ddl/sqlite/files/021_populate_build_config.sql b/server/store/datastore/ddl/sqlite/files/021_populate_build_config.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/021_populate_build_config.sql
rename to server/store/datastore/ddl/sqlite/files/021_populate_build_config.sql
diff --git a/store/datastore/ddl/sqlite/files/022_add_task_columns.sql b/server/store/datastore/ddl/sqlite/files/022_add_task_columns.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/022_add_task_columns.sql
rename to server/store/datastore/ddl/sqlite/files/022_add_task_columns.sql
diff --git a/store/datastore/ddl/sqlite/files/023_add_repo_fallback_column.sql b/server/store/datastore/ddl/sqlite/files/023_add_repo_fallback_column.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/023_add_repo_fallback_column.sql
rename to server/store/datastore/ddl/sqlite/files/023_add_repo_fallback_column.sql
diff --git a/store/datastore/ddl/sqlite/files/024_add_repo_fallback_column.sql b/server/store/datastore/ddl/sqlite/files/024_add_repo_fallback_column.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/024_add_repo_fallback_column.sql
rename to server/store/datastore/ddl/sqlite/files/024_add_repo_fallback_column.sql
diff --git a/store/datastore/ddl/sqlite/files/025_add_builds_changed_files_column.sql b/server/store/datastore/ddl/sqlite/files/025_add_builds_changed_files_column.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/025_add_builds_changed_files_column.sql
rename to server/store/datastore/ddl/sqlite/files/025_add_builds_changed_files_column.sql
diff --git a/store/datastore/ddl/sqlite/files/026_drop_repo_fallback_column.sql b/server/store/datastore/ddl/sqlite/files/026_drop_repo_fallback_column.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/026_drop_repo_fallback_column.sql
rename to server/store/datastore/ddl/sqlite/files/026_drop_repo_fallback_column.sql
diff --git a/store/datastore/ddl/sqlite/files/027_drop_allow_push_tags_deployments_columns.sql b/server/store/datastore/ddl/sqlite/files/027_drop_allow_push_tags_deployments_columns.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/027_drop_allow_push_tags_deployments_columns.sql
rename to server/store/datastore/ddl/sqlite/files/027_drop_allow_push_tags_deployments_columns.sql
diff --git a/store/datastore/ddl/sqlite/files/028_update_table_set_users_token_and_secret_length.sql b/server/store/datastore/ddl/sqlite/files/028_update_table_set_users_token_and_secret_length.sql
similarity index 100%
rename from store/datastore/ddl/sqlite/files/028_update_table_set_users_token_and_secret_length.sql
rename to server/store/datastore/ddl/sqlite/files/028_update_table_set_users_token_and_secret_length.sql
diff --git a/store/datastore/files.go b/server/store/datastore/files.go
similarity index 97%
rename from store/datastore/files.go
rename to server/store/datastore/files.go
index b66f14a13..034d88f1e 100644
--- a/store/datastore/files.go
+++ b/server/store/datastore/files.go
@@ -20,7 +20,7 @@ import (
 	"io/ioutil"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 
 	"github.com/russross/meddler"
 )
diff --git a/store/datastore/files_test.go b/server/store/datastore/files_test.go
similarity index 100%
rename from store/datastore/files_test.go
rename to server/store/datastore/files_test.go
diff --git a/store/datastore/init.go b/server/store/datastore/init.go
similarity index 100%
rename from store/datastore/init.go
rename to server/store/datastore/init.go
diff --git a/store/datastore/init_cgo.go b/server/store/datastore/init_cgo.go
similarity index 100%
rename from store/datastore/init_cgo.go
rename to server/store/datastore/init_cgo.go
diff --git a/store/datastore/logs.go b/server/store/datastore/logs.go
similarity index 95%
rename from store/datastore/logs.go
rename to server/store/datastore/logs.go
index 99a402a2f..1070ceb5d 100644
--- a/store/datastore/logs.go
+++ b/server/store/datastore/logs.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) LogFind(proc *model.Proc) (io.ReadCloser, error) {
diff --git a/store/datastore/logs_test.go b/server/store/datastore/logs_test.go
similarity index 100%
rename from store/datastore/logs_test.go
rename to server/store/datastore/logs_test.go
diff --git a/store/datastore/perms.go b/server/store/datastore/perms.go
similarity index 96%
rename from store/datastore/perms.go
rename to server/store/datastore/perms.go
index bf7d718ff..26193f992 100644
--- a/store/datastore/perms.go
+++ b/server/store/datastore/perms.go
@@ -16,7 +16,7 @@ package datastore
 
 import (
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 
 	"github.com/russross/meddler"
 )
diff --git a/store/datastore/perms_test.go b/server/store/datastore/perms_test.go
similarity index 100%
rename from store/datastore/perms_test.go
rename to server/store/datastore/perms_test.go
diff --git a/store/datastore/procs.go b/server/store/datastore/procs.go
similarity index 97%
rename from store/datastore/procs.go
rename to server/store/datastore/procs.go
index 43f152f39..7d20996d4 100644
--- a/store/datastore/procs.go
+++ b/server/store/datastore/procs.go
@@ -17,7 +17,7 @@ package datastore
 import (
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) ProcLoad(id int64) (*model.Proc, error) {
diff --git a/store/datastore/procs_test.go b/server/store/datastore/procs_test.go
similarity index 100%
rename from store/datastore/procs_test.go
rename to server/store/datastore/procs_test.go
diff --git a/store/datastore/registry.go b/server/store/datastore/registry.go
similarity index 96%
rename from store/datastore/registry.go
rename to server/store/datastore/registry.go
index 7821ce9ec..a8365f4f4 100644
--- a/store/datastore/registry.go
+++ b/server/store/datastore/registry.go
@@ -17,7 +17,7 @@ package datastore
 import (
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) RegistryFind(repo *model.Repo, addr string) (*model.Registry, error) {
diff --git a/store/datastore/registry_test.go b/server/store/datastore/registry_test.go
similarity index 100%
rename from store/datastore/registry_test.go
rename to server/store/datastore/registry_test.go
diff --git a/store/datastore/repos.go b/server/store/datastore/repos.go
similarity index 97%
rename from store/datastore/repos.go
rename to server/store/datastore/repos.go
index e69509b9c..033d42c44 100644
--- a/store/datastore/repos.go
+++ b/server/store/datastore/repos.go
@@ -17,7 +17,7 @@ package datastore
 import (
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) GetRepo(id int64) (*model.Repo, error) {
diff --git a/store/datastore/repos_test.go b/server/store/datastore/repos_test.go
similarity index 100%
rename from store/datastore/repos_test.go
rename to server/store/datastore/repos_test.go
diff --git a/store/datastore/secret.go b/server/store/datastore/secret.go
similarity index 95%
rename from store/datastore/secret.go
rename to server/store/datastore/secret.go
index 91c7fa0dd..1367edf5d 100644
--- a/store/datastore/secret.go
+++ b/server/store/datastore/secret.go
@@ -17,7 +17,7 @@ package datastore
 import (
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) SecretFind(repo *model.Repo, name string) (*model.Secret, error) {
diff --git a/store/datastore/secret_test.go b/server/store/datastore/secret_test.go
similarity index 100%
rename from store/datastore/secret_test.go
rename to server/store/datastore/secret_test.go
diff --git a/store/datastore/sender.go b/server/store/datastore/sender.go
similarity index 95%
rename from store/datastore/sender.go
rename to server/store/datastore/sender.go
index ef71a8fd9..af42422da 100644
--- a/store/datastore/sender.go
+++ b/server/store/datastore/sender.go
@@ -17,7 +17,7 @@ package datastore
 import (
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) SenderFind(repo *model.Repo, login string) (*model.Sender, error) {
diff --git a/store/datastore/sender_test.go b/server/store/datastore/sender_test.go
similarity index 100%
rename from store/datastore/sender_test.go
rename to server/store/datastore/sender_test.go
diff --git a/store/datastore/sql/lookup.go b/server/store/datastore/sql/lookup.go
similarity index 82%
rename from store/datastore/sql/lookup.go
rename to server/store/datastore/sql/lookup.go
index 2655124ca..5c306db90 100644
--- a/store/datastore/sql/lookup.go
+++ b/server/store/datastore/sql/lookup.go
@@ -15,9 +15,9 @@
 package sql
 
 import (
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql/mysql"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql/postgres"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql/sqlite"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql/mysql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql/postgres"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql/sqlite"
 )
 
 // Supported database drivers
diff --git a/store/datastore/sql/mysql/files/config.sql b/server/store/datastore/sql/mysql/files/config.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/config.sql
rename to server/store/datastore/sql/mysql/files/config.sql
diff --git a/store/datastore/sql/mysql/files/counts.sql b/server/store/datastore/sql/mysql/files/counts.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/counts.sql
rename to server/store/datastore/sql/mysql/files/counts.sql
diff --git a/store/datastore/sql/mysql/files/feed.sql b/server/store/datastore/sql/mysql/files/feed.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/feed.sql
rename to server/store/datastore/sql/mysql/files/feed.sql
diff --git a/store/datastore/sql/mysql/files/files.sql b/server/store/datastore/sql/mysql/files/files.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/files.sql
rename to server/store/datastore/sql/mysql/files/files.sql
diff --git a/store/datastore/sql/mysql/files/logs.sql b/server/store/datastore/sql/mysql/files/logs.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/logs.sql
rename to server/store/datastore/sql/mysql/files/logs.sql
diff --git a/store/datastore/sql/mysql/files/perms.sql b/server/store/datastore/sql/mysql/files/perms.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/perms.sql
rename to server/store/datastore/sql/mysql/files/perms.sql
diff --git a/store/datastore/sql/mysql/files/procs.sql b/server/store/datastore/sql/mysql/files/procs.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/procs.sql
rename to server/store/datastore/sql/mysql/files/procs.sql
diff --git a/store/datastore/sql/mysql/files/registry.sql b/server/store/datastore/sql/mysql/files/registry.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/registry.sql
rename to server/store/datastore/sql/mysql/files/registry.sql
diff --git a/store/datastore/sql/mysql/files/repos.sql b/server/store/datastore/sql/mysql/files/repos.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/repos.sql
rename to server/store/datastore/sql/mysql/files/repos.sql
diff --git a/store/datastore/sql/mysql/files/secret.sql b/server/store/datastore/sql/mysql/files/secret.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/secret.sql
rename to server/store/datastore/sql/mysql/files/secret.sql
diff --git a/store/datastore/sql/mysql/files/sender.sql b/server/store/datastore/sql/mysql/files/sender.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/sender.sql
rename to server/store/datastore/sql/mysql/files/sender.sql
diff --git a/store/datastore/sql/mysql/files/task.sql b/server/store/datastore/sql/mysql/files/task.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/task.sql
rename to server/store/datastore/sql/mysql/files/task.sql
diff --git a/store/datastore/sql/mysql/files/users.sql b/server/store/datastore/sql/mysql/files/users.sql
similarity index 100%
rename from store/datastore/sql/mysql/files/users.sql
rename to server/store/datastore/sql/mysql/files/users.sql
diff --git a/store/datastore/sql/mysql/sql.go b/server/store/datastore/sql/mysql/sql.go
similarity index 100%
rename from store/datastore/sql/mysql/sql.go
rename to server/store/datastore/sql/mysql/sql.go
diff --git a/store/datastore/sql/mysql/sql_gen.go b/server/store/datastore/sql/mysql/sql_gen.go
similarity index 100%
rename from store/datastore/sql/mysql/sql_gen.go
rename to server/store/datastore/sql/mysql/sql_gen.go
diff --git a/store/datastore/sql/postgres/files/config.sql b/server/store/datastore/sql/postgres/files/config.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/config.sql
rename to server/store/datastore/sql/postgres/files/config.sql
diff --git a/store/datastore/sql/postgres/files/counts.sql b/server/store/datastore/sql/postgres/files/counts.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/counts.sql
rename to server/store/datastore/sql/postgres/files/counts.sql
diff --git a/store/datastore/sql/postgres/files/feed.sql b/server/store/datastore/sql/postgres/files/feed.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/feed.sql
rename to server/store/datastore/sql/postgres/files/feed.sql
diff --git a/store/datastore/sql/postgres/files/files.sql b/server/store/datastore/sql/postgres/files/files.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/files.sql
rename to server/store/datastore/sql/postgres/files/files.sql
diff --git a/store/datastore/sql/postgres/files/logs.sql b/server/store/datastore/sql/postgres/files/logs.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/logs.sql
rename to server/store/datastore/sql/postgres/files/logs.sql
diff --git a/store/datastore/sql/postgres/files/perms.sql b/server/store/datastore/sql/postgres/files/perms.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/perms.sql
rename to server/store/datastore/sql/postgres/files/perms.sql
diff --git a/store/datastore/sql/postgres/files/procs.sql b/server/store/datastore/sql/postgres/files/procs.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/procs.sql
rename to server/store/datastore/sql/postgres/files/procs.sql
diff --git a/store/datastore/sql/postgres/files/registry.sql b/server/store/datastore/sql/postgres/files/registry.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/registry.sql
rename to server/store/datastore/sql/postgres/files/registry.sql
diff --git a/store/datastore/sql/postgres/files/repos.sql b/server/store/datastore/sql/postgres/files/repos.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/repos.sql
rename to server/store/datastore/sql/postgres/files/repos.sql
diff --git a/store/datastore/sql/postgres/files/secret.sql b/server/store/datastore/sql/postgres/files/secret.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/secret.sql
rename to server/store/datastore/sql/postgres/files/secret.sql
diff --git a/store/datastore/sql/postgres/files/sender.sql b/server/store/datastore/sql/postgres/files/sender.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/sender.sql
rename to server/store/datastore/sql/postgres/files/sender.sql
diff --git a/store/datastore/sql/postgres/files/tasks.sql b/server/store/datastore/sql/postgres/files/tasks.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/tasks.sql
rename to server/store/datastore/sql/postgres/files/tasks.sql
diff --git a/store/datastore/sql/postgres/files/users.sql b/server/store/datastore/sql/postgres/files/users.sql
similarity index 100%
rename from store/datastore/sql/postgres/files/users.sql
rename to server/store/datastore/sql/postgres/files/users.sql
diff --git a/store/datastore/sql/postgres/sql.go b/server/store/datastore/sql/postgres/sql.go
similarity index 100%
rename from store/datastore/sql/postgres/sql.go
rename to server/store/datastore/sql/postgres/sql.go
diff --git a/store/datastore/sql/postgres/sql_gen.go b/server/store/datastore/sql/postgres/sql_gen.go
similarity index 100%
rename from store/datastore/sql/postgres/sql_gen.go
rename to server/store/datastore/sql/postgres/sql_gen.go
diff --git a/store/datastore/sql/sqlite/files/config.sql b/server/store/datastore/sql/sqlite/files/config.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/config.sql
rename to server/store/datastore/sql/sqlite/files/config.sql
diff --git a/store/datastore/sql/sqlite/files/counts.sql b/server/store/datastore/sql/sqlite/files/counts.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/counts.sql
rename to server/store/datastore/sql/sqlite/files/counts.sql
diff --git a/store/datastore/sql/sqlite/files/feed.sql b/server/store/datastore/sql/sqlite/files/feed.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/feed.sql
rename to server/store/datastore/sql/sqlite/files/feed.sql
diff --git a/store/datastore/sql/sqlite/files/files.sql b/server/store/datastore/sql/sqlite/files/files.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/files.sql
rename to server/store/datastore/sql/sqlite/files/files.sql
diff --git a/store/datastore/sql/sqlite/files/logs.sql b/server/store/datastore/sql/sqlite/files/logs.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/logs.sql
rename to server/store/datastore/sql/sqlite/files/logs.sql
diff --git a/store/datastore/sql/sqlite/files/perms.sql b/server/store/datastore/sql/sqlite/files/perms.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/perms.sql
rename to server/store/datastore/sql/sqlite/files/perms.sql
diff --git a/store/datastore/sql/sqlite/files/procs.sql b/server/store/datastore/sql/sqlite/files/procs.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/procs.sql
rename to server/store/datastore/sql/sqlite/files/procs.sql
diff --git a/store/datastore/sql/sqlite/files/registry.sql b/server/store/datastore/sql/sqlite/files/registry.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/registry.sql
rename to server/store/datastore/sql/sqlite/files/registry.sql
diff --git a/store/datastore/sql/sqlite/files/repos.sql b/server/store/datastore/sql/sqlite/files/repos.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/repos.sql
rename to server/store/datastore/sql/sqlite/files/repos.sql
diff --git a/store/datastore/sql/sqlite/files/secret.sql b/server/store/datastore/sql/sqlite/files/secret.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/secret.sql
rename to server/store/datastore/sql/sqlite/files/secret.sql
diff --git a/store/datastore/sql/sqlite/files/sender.sql b/server/store/datastore/sql/sqlite/files/sender.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/sender.sql
rename to server/store/datastore/sql/sqlite/files/sender.sql
diff --git a/store/datastore/sql/sqlite/files/task.sql b/server/store/datastore/sql/sqlite/files/task.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/task.sql
rename to server/store/datastore/sql/sqlite/files/task.sql
diff --git a/store/datastore/sql/sqlite/files/user.sql b/server/store/datastore/sql/sqlite/files/user.sql
similarity index 100%
rename from store/datastore/sql/sqlite/files/user.sql
rename to server/store/datastore/sql/sqlite/files/user.sql
diff --git a/store/datastore/sql/sqlite/sql.go b/server/store/datastore/sql/sqlite/sql.go
similarity index 100%
rename from store/datastore/sql/sqlite/sql.go
rename to server/store/datastore/sql/sqlite/sql.go
diff --git a/store/datastore/sql/sqlite/sql_gen.go b/server/store/datastore/sql/sqlite/sql_gen.go
similarity index 100%
rename from store/datastore/sql/sqlite/sql_gen.go
rename to server/store/datastore/sql/sqlite/sql_gen.go
diff --git a/store/datastore/store.go b/server/store/datastore/store.go
similarity index 96%
rename from store/datastore/store.go
rename to server/store/datastore/store.go
index c54262e0e..57db87ccd 100644
--- a/store/datastore/store.go
+++ b/server/store/datastore/store.go
@@ -20,8 +20,8 @@ import (
 	"time"
 
 	"github.com/russross/meddler"
-	"github.com/woodpecker-ci/woodpecker/store"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/ddl"
+	"github.com/woodpecker-ci/woodpecker/server/store"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/ddl"
 
 	"github.com/sirupsen/logrus"
 )
diff --git a/store/datastore/task.go b/server/store/datastore/task.go
similarity index 94%
rename from store/datastore/task.go
rename to server/store/datastore/task.go
index c57da5868..872eaa744 100644
--- a/store/datastore/task.go
+++ b/server/store/datastore/task.go
@@ -17,7 +17,7 @@ package datastore
 import (
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) TaskList() ([]*model.Task, error) {
diff --git a/store/datastore/task_test.go b/server/store/datastore/task_test.go
similarity index 100%
rename from store/datastore/task_test.go
rename to server/store/datastore/task_test.go
diff --git a/store/datastore/users.go b/server/store/datastore/users.go
similarity index 96%
rename from store/datastore/users.go
rename to server/store/datastore/users.go
index 30e6733c6..fe42850fc 100644
--- a/store/datastore/users.go
+++ b/server/store/datastore/users.go
@@ -17,7 +17,7 @@ package datastore
 import (
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) GetUser(id int64) (*model.User, error) {
diff --git a/store/datastore/users_test.go b/server/store/datastore/users_test.go
similarity index 100%
rename from store/datastore/users_test.go
rename to server/store/datastore/users_test.go
diff --git a/store/datastore/utils.go b/server/store/datastore/utils.go
similarity index 100%
rename from store/datastore/utils.go
rename to server/store/datastore/utils.go
diff --git a/store/store.go b/server/store/store.go
similarity index 100%
rename from store/store.go
rename to server/store/store.go