diff --git a/magneticod/bittorrent/operations.go b/cmd/magneticod/bittorrent/operations.go
similarity index 100%
rename from magneticod/bittorrent/operations.go
rename to cmd/magneticod/bittorrent/operations.go
diff --git a/magneticod/bittorrent/operations_test.go b/cmd/magneticod/bittorrent/operations_test.go
similarity index 100%
rename from magneticod/bittorrent/operations_test.go
rename to cmd/magneticod/bittorrent/operations_test.go
diff --git a/magneticod/bittorrent/sinkMetadata.go b/cmd/magneticod/bittorrent/sinkMetadata.go
similarity index 100%
rename from magneticod/bittorrent/sinkMetadata.go
rename to cmd/magneticod/bittorrent/sinkMetadata.go
diff --git a/magneticod/dht/mainline/codec.go b/cmd/magneticod/dht/mainline/codec.go
similarity index 100%
rename from magneticod/dht/mainline/codec.go
rename to cmd/magneticod/dht/mainline/codec.go
diff --git a/magneticod/dht/mainline/codec_test.go b/cmd/magneticod/dht/mainline/codec_test.go
similarity index 100%
rename from magneticod/dht/mainline/codec_test.go
rename to cmd/magneticod/dht/mainline/codec_test.go
diff --git a/magneticod/dht/mainline/protocol.go b/cmd/magneticod/dht/mainline/protocol.go
similarity index 100%
rename from magneticod/dht/mainline/protocol.go
rename to cmd/magneticod/dht/mainline/protocol.go
diff --git a/magneticod/dht/mainline/protocol_test.go b/cmd/magneticod/dht/mainline/protocol_test.go
similarity index 100%
rename from magneticod/dht/mainline/protocol_test.go
rename to cmd/magneticod/dht/mainline/protocol_test.go
diff --git a/magneticod/dht/mainline/service.go b/cmd/magneticod/dht/mainline/service.go
similarity index 100%
rename from magneticod/dht/mainline/service.go
rename to cmd/magneticod/dht/mainline/service.go
diff --git a/magneticod/dht/mainline/transport.go b/cmd/magneticod/dht/mainline/transport.go
similarity index 100%
rename from magneticod/dht/mainline/transport.go
rename to cmd/magneticod/dht/mainline/transport.go
diff --git a/magneticod/dht/mainline/transport_test.go b/cmd/magneticod/dht/mainline/transport_test.go
similarity index 100%
rename from magneticod/dht/mainline/transport_test.go
rename to cmd/magneticod/dht/mainline/transport_test.go
diff --git a/magneticod/dht/managers.go b/cmd/magneticod/dht/managers.go
similarity index 100%
rename from magneticod/dht/managers.go
rename to cmd/magneticod/dht/managers.go
diff --git a/magneticod/main.go b/cmd/magneticod/main.go
similarity index 100%
rename from magneticod/main.go
rename to cmd/magneticod/main.go
diff --git a/magneticod/main_test.go b/cmd/magneticod/main_test.go
similarity index 100%
rename from magneticod/main_test.go
rename to cmd/magneticod/main_test.go
diff --git a/magneticow/data/static/assets/feed.png b/cmd/magneticow/data/static/assets/feed.png
similarity index 100%
rename from magneticow/data/static/assets/feed.png
rename to cmd/magneticow/data/static/assets/feed.png
diff --git a/magneticow/data/static/assets/magnet.gif b/cmd/magneticow/data/static/assets/magnet.gif
similarity index 100%
rename from magneticow/data/static/assets/magnet.gif
rename to cmd/magneticow/data/static/assets/magnet.gif
diff --git a/magneticow/data/static/fonts/NotoMono/LICENSE_OFL.txt b/cmd/magneticow/data/static/fonts/NotoMono/LICENSE_OFL.txt
similarity index 100%
rename from magneticow/data/static/fonts/NotoMono/LICENSE_OFL.txt
rename to cmd/magneticow/data/static/fonts/NotoMono/LICENSE_OFL.txt
diff --git a/magneticow/data/static/fonts/NotoMono/Regular.ttf b/cmd/magneticow/data/static/fonts/NotoMono/Regular.ttf
similarity index 100%
rename from magneticow/data/static/fonts/NotoMono/Regular.ttf
rename to cmd/magneticow/data/static/fonts/NotoMono/Regular.ttf
diff --git a/magneticow/data/static/fonts/NotoSansUI/Bold.ttf b/cmd/magneticow/data/static/fonts/NotoSansUI/Bold.ttf
similarity index 100%
rename from magneticow/data/static/fonts/NotoSansUI/Bold.ttf
rename to cmd/magneticow/data/static/fonts/NotoSansUI/Bold.ttf
diff --git a/magneticow/data/static/fonts/NotoSansUI/BoldItalic.ttf b/cmd/magneticow/data/static/fonts/NotoSansUI/BoldItalic.ttf
similarity index 100%
rename from magneticow/data/static/fonts/NotoSansUI/BoldItalic.ttf
rename to cmd/magneticow/data/static/fonts/NotoSansUI/BoldItalic.ttf
diff --git a/magneticow/data/static/fonts/NotoSansUI/Italic.ttf b/cmd/magneticow/data/static/fonts/NotoSansUI/Italic.ttf
similarity index 100%
rename from magneticow/data/static/fonts/NotoSansUI/Italic.ttf
rename to cmd/magneticow/data/static/fonts/NotoSansUI/Italic.ttf
diff --git a/magneticow/data/static/fonts/NotoSansUI/LICENSE_OFL.txt b/cmd/magneticow/data/static/fonts/NotoSansUI/LICENSE_OFL.txt
similarity index 100%
rename from magneticow/data/static/fonts/NotoSansUI/LICENSE_OFL.txt
rename to cmd/magneticow/data/static/fonts/NotoSansUI/LICENSE_OFL.txt
diff --git a/magneticow/data/static/fonts/NotoSansUI/Regular.ttf b/cmd/magneticow/data/static/fonts/NotoSansUI/Regular.ttf
similarity index 100%
rename from magneticow/data/static/fonts/NotoSansUI/Regular.ttf
rename to cmd/magneticow/data/static/fonts/NotoSansUI/Regular.ttf
diff --git a/magneticow/data/static/scripts/plotly-v1.26.1.min.js b/cmd/magneticow/data/static/scripts/plotly-v1.26.1.min.js
similarity index 100%
rename from magneticow/data/static/scripts/plotly-v1.26.1.min.js
rename to cmd/magneticow/data/static/scripts/plotly-v1.26.1.min.js
diff --git a/magneticow/data/static/scripts/statistics.js b/cmd/magneticow/data/static/scripts/statistics.js
similarity index 100%
rename from magneticow/data/static/scripts/statistics.js
rename to cmd/magneticow/data/static/scripts/statistics.js
diff --git a/magneticow/data/static/scripts/torrent.js b/cmd/magneticow/data/static/scripts/torrent.js
similarity index 100%
rename from magneticow/data/static/scripts/torrent.js
rename to cmd/magneticow/data/static/scripts/torrent.js
diff --git a/magneticow/data/static/styles/essential.css b/cmd/magneticow/data/static/styles/essential.css
similarity index 100%
rename from magneticow/data/static/styles/essential.css
rename to cmd/magneticow/data/static/styles/essential.css
diff --git a/magneticow/data/static/styles/homepage.css b/cmd/magneticow/data/static/styles/homepage.css
similarity index 100%
rename from magneticow/data/static/styles/homepage.css
rename to cmd/magneticow/data/static/styles/homepage.css
diff --git a/magneticow/data/static/styles/reset.css b/cmd/magneticow/data/static/styles/reset.css
similarity index 100%
rename from magneticow/data/static/styles/reset.css
rename to cmd/magneticow/data/static/styles/reset.css
diff --git a/magneticow/data/static/styles/statistics.css b/cmd/magneticow/data/static/styles/statistics.css
similarity index 100%
rename from magneticow/data/static/styles/statistics.css
rename to cmd/magneticow/data/static/styles/statistics.css
diff --git a/magneticow/data/static/styles/torrent.css b/cmd/magneticow/data/static/styles/torrent.css
similarity index 100%
rename from magneticow/data/static/styles/torrent.css
rename to cmd/magneticow/data/static/styles/torrent.css
diff --git a/magneticow/data/static/styles/torrents.css b/cmd/magneticow/data/static/styles/torrents.css
similarity index 100%
rename from magneticow/data/static/styles/torrents.css
rename to cmd/magneticow/data/static/styles/torrents.css
diff --git a/magneticow/data/templates/feed.xml b/cmd/magneticow/data/templates/feed.xml
similarity index 100%
rename from magneticow/data/templates/feed.xml
rename to cmd/magneticow/data/templates/feed.xml
diff --git a/magneticow/data/templates/homepage.html b/cmd/magneticow/data/templates/homepage.html
similarity index 100%
rename from magneticow/data/templates/homepage.html
rename to cmd/magneticow/data/templates/homepage.html
diff --git a/magneticow/data/templates/statistics.html b/cmd/magneticow/data/templates/statistics.html
similarity index 100%
rename from magneticow/data/templates/statistics.html
rename to cmd/magneticow/data/templates/statistics.html
diff --git a/magneticow/data/templates/torrent.html b/cmd/magneticow/data/templates/torrent.html
similarity index 100%
rename from magneticow/data/templates/torrent.html
rename to cmd/magneticow/data/templates/torrent.html
diff --git a/magneticow/data/templates/torrents.html b/cmd/magneticow/data/templates/torrents.html
similarity index 100%
rename from magneticow/data/templates/torrents.html
rename to cmd/magneticow/data/templates/torrents.html
diff --git a/magneticow/main.go b/cmd/magneticow/main.go
similarity index 100%
rename from magneticow/main.go
rename to cmd/magneticow/main.go
diff --git a/persistence/interface.go b/pkg/persistence/interface.go
similarity index 100%
rename from persistence/interface.go
rename to pkg/persistence/interface.go
diff --git a/persistence/sqlite3.go b/pkg/persistence/sqlite3.go
similarity index 100%
rename from persistence/sqlite3.go
rename to pkg/persistence/sqlite3.go