diff --git a/Makefile b/Makefile
index b65eaf6..72efc09 100644
--- a/Makefile
+++ b/Makefile
@@ -55,4 +55,4 @@ attach-db:
 
 # Generate Go server boilerplate from OpenAPI 3
 codegen:
-	oapi-codegen -generate models -o internal/app/apimodels/models.go --package models api/swagger.yaml
+	oapi-codegen -generate models -o internal/app/apimodels/models.gen.go --package models api/swagger.yaml
diff --git a/README.md b/README.md
index fad08e6..3e9f465 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Roadmap [here](TODO.md)
 ├── cmd # main app
 │   └── ctf01d
 │       └── main.go
-├── configs # config
+├── config
 │   ├── config.go
 │   └── config.yml
 ├── internal
diff --git a/cmd/ctf01d/main.go b/cmd/ctf01d/main.go
index fc179d7..a851adc 100644
--- a/cmd/ctf01d/main.go
+++ b/cmd/ctf01d/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	config "ctf01d/configs"
+	"ctf01d/config"
 	"ctf01d/internal/app/routers"
 	"database/sql"
 	"log/slog"
diff --git a/configs/config.go b/config/config.go
similarity index 93%
rename from configs/config.go
rename to config/config.go
index 007a0f6..1648490 100644
--- a/configs/config.go
+++ b/config/config.go
@@ -31,7 +31,7 @@ type (
 func NewConfig() (*Config, error) {
 	cfg := &Config{}
 
-	err := cleanenv.ReadConfig("./configs/config.yml", cfg)
+	err := cleanenv.ReadConfig("./config/config.yml", cfg)
 	if err != nil {
 		return nil, fmt.Errorf("%w", err)
 	}
diff --git a/configs/config.yml b/config/config.yml
similarity index 100%
rename from configs/config.yml
rename to config/config.yml
diff --git a/internal/app/apimodels/models.go b/internal/app/apimodels/models.gen.go
similarity index 100%
rename from internal/app/apimodels/models.go
rename to internal/app/apimodels/models.gen.go