diff --git a/app/t2-stats/go.mod b/app/t2-stat-parser/go.mod
similarity index 100%
rename from app/t2-stats/go.mod
rename to app/t2-stat-parser/go.mod
diff --git a/app/t2-stats/go.sum b/app/t2-stat-parser/go.sum
similarity index 100%
rename from app/t2-stats/go.sum
rename to app/t2-stat-parser/go.sum
diff --git a/app/t2-stats/main.go b/app/t2-stat-parser/main.go
similarity index 100%
rename from app/t2-stats/main.go
rename to app/t2-stat-parser/main.go
diff --git a/app/t2-stats/parser.go b/app/t2-stat-parser/parser.go
similarity index 100%
rename from app/t2-stats/parser.go
rename to app/t2-stat-parser/parser.go
diff --git a/app/t2-stats/start.sh b/app/t2-stat-parser/start.sh
similarity index 100%
rename from app/t2-stats/start.sh
rename to app/t2-stat-parser/start.sh
diff --git a/build/go/Dockerfile b/build/go-t2-stat-parser/Dockerfile
similarity index 89%
rename from build/go/Dockerfile
rename to build/go-t2-stat-parser/Dockerfile
index dbddd2f..063c82b 100644
--- a/build/go/Dockerfile
+++ b/build/go-t2-stat-parser/Dockerfile
@@ -9,7 +9,7 @@ ENV GO111MODULE=on \
 
 
 WORKDIR /app
-COPY ./app/t2-stats /app
+COPY ./app/t2-stat-parser /app
 
 # Copy and download dependency using go mod
 RUN go mod download
@@ -37,6 +37,6 @@ LABEL maintainer="Anthony Mineo <anthonymineo@gmail.com>"
 WORKDIR /app
 
 COPY --from=builder /app/main /app/main
-COPY ./app/t2-stats/start.sh /app/start.sh
+COPY ./app/t2-stat-parser/start.sh /app/start.sh
 
 ENTRYPOINT ./start.sh
\ No newline at end of file
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 0ee6c79..0b5ea67 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -3,11 +3,11 @@ version: "3.7"
 # Service Definitions
 services:
 
-  app:
+  parser:
     environment: 
       DATABASE_URL: "postgres://dev:dev@db:5432/t2_stats"
     volumes:
-      - ./app/t2-stats:/app
+      - ./app/t2-stat-parser:/app
   
   db:
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 3869f63..7cf88b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,10 +17,10 @@ services:
       - internal      
 
 
-  app:
+  parser:
     build:
       context: .
-      dockerfile: ./build/go/Dockerfile
+      dockerfile: ./build/go-t2-stat-parser/Dockerfile
     ports:
       - "8080:8080"
     depends_on: