sustainability-software-lab · lsetiawan · Apr 14, 2026 · Apr 14, 2026 · Apr 14, 2026
diff --git a/README.md b/README.md
@@ -151,21 +151,15 @@ pixi run pre-commit-install
 
 ### Running the ETL Pipeline
 
-````bash
+```bash
 # Create environment file from template
 cp resources/docker/.env.example resources/docker/.env
 
-<<<<<<< docs-improvement
-```bash
 # 1. Start all services (PostgreSQL, Prefect server, worker)
-=======
-# Start all services (PostgreSQL, Prefect server, worker)
->>>>>>> main
 pixi run start-services
 
-# Deploy and run ETL flows
+# 2. Deploy ETL flows
 pixi run deploy
-<<<<<<< docs-improvement
 
 # 3. Apply any pending database migrations
 # Note: start-services automatically applies migrations at startup via the
@@ -180,12 +174,7 @@ pixi run run-etl
 
 # Stop services
 pixi run teardown-services
-=======
-pixi run run-etl
-
-# Monitor via Prefect UI at http://localhost:4200
->>>>>>> main
-````
+```
 
 ### Running the Web Service
 
@@ -208,18 +197,15 @@ pixi run -e docs docs-serve
 
 ## Contributing
 
-See [`docs/CONTRIBUTING.md`](docs/CONTRIBUTING.md) for general contribution
-guidelines (branching, PRs, commit style, pre-commit setup).
+See [CONTRIBUTING.md](CONTRIBUTING.md) for general contribution guidelines
+(branching, PRs, commit style, pre-commit setup).
 
 Each namespace package also has its own contributing guide with
 component-specific details:
 
-- [`docs/datamodels/CONTRIBUTING.md`](docs/datamodels/CONTRIBUTING.md) -- Data
-  models and database schema
-- [`docs/pipeline/CONTRIBUTING.md`](docs/pipeline/CONTRIBUTING.md) -- ETL
-  pipeline and Prefect workflows
-- [`docs/webservice/CONTRIBUTING.md`](docs/webservice/CONTRIBUTING.md) --
-  FastAPI web service
+- [Datamodels](datamodels/CONTRIBUTING.md): Data models and database schema
+- [Pipeline](pipeline/CONTRIBUTING.md): ETL pipeline and Prefect workflows
+- [Webservice](webservice/CONTRIBUTING.md): FastAPI web service
 
 ## Acknowledgement
 

diff --git a/datamodels b/datamodels
@@ -0,0 +1 @@
+docs/datamodels
diff --git a/docs/LICENSE b/docs/LICENSE
@@ -0,0 +1 @@
+../LICENSE
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
@@ -0,0 +1 @@
+../SECURITY.md
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -78,4 +78,5 @@ nav:
   - Changelog: CHANGELOG.md
   - Contributing: CONTRIBUTING.md
   - Code of Conduct: CODE_OF_CONDUCT.md
-  - ERD View: ERD_VIEW.md
+  - Security: SECURITY.md
+  - License: LICENSE
diff --git a/pipeline b/pipeline
@@ -0,0 +1 @@
+docs/pipeline
diff --git a/webservice b/webservice
@@ -0,0 +1 @@
+docs/webservice