diff --git a/.gitignore b/.gitignore
index c5e82d7..de6ac7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-bin
\ No newline at end of file
+bin
+*key
+*crt
+*csr
\ No newline at end of file
diff --git a/Makefile b/Makefile
index acaae34..707cbc1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,15 @@
-build:
-	go build -o bin/main main.go
+build-server:
+	go build -o bin/server server/main.go
 
-run:
-	./bin/main
+build-client:
+	go build -o bin/client client/main.go
 
-all: build run
\ No newline at end of file
+run-server:
+	./bin/server
+
+run-client:
+	./bin/client
+
+server: build-server run-server
+
+client: build-client run-client
\ No newline at end of file
diff --git a/client/main.go b/client/main.go
new file mode 100644
index 0000000..2e53a20
--- /dev/null
+++ b/client/main.go
@@ -0,0 +1,7 @@
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("Let's build the client!")
+}
diff --git a/main.go b/main.go
deleted file mode 100644
index d15a6b1..0000000
--- a/main.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package main
-
-import "fmt"
-
-func main() {
-	fmt.Println("This is the beginning of an awesome project!")
-}
diff --git a/server/main.go b/server/main.go
new file mode 100644
index 0000000..fca2bd6
--- /dev/null
+++ b/server/main.go
@@ -0,0 +1,9 @@
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println("Let's build the server!")
+}