diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22ef385..eeb75fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build
 on:
   push:
     branches:
-      - mvp
+      - Wesam-Naseer-patch-3
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
diff --git a/.github/workflows/formatter.yml b/.github/workflows/formatter.yml
new file mode 100644
index 0000000..4dc686b
--- /dev/null
+++ b/.github/workflows/formatter.yml
@@ -0,0 +1,22 @@
+name: Format Code Base
+
+on:
+  push:
+    branches-ignore: [ Wesam-Naseer-patch-3 ]
+
+jobs:
+  build:
+    name: Format Code Base
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+    
+      - name: Install flutter
+        run: sudo snap install flutter --classic
+      
+      - name: Fetch dependencies
+        run: flutter pub get
+
+      - name: Format Code Base
+        run: flutter format --set-exit-if-changed .
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
new file mode 100644
index 0000000..01f992e
--- /dev/null
+++ b/.github/workflows/linter.yml
@@ -0,0 +1,22 @@
+name: Lint Code Base
+
+on:
+  push:
+    branches-ignore: [ Wesam-Naseer-patch-3 ]
+
+jobs:
+  build:
+    name: Lint Code Base
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+    
+      - name: Install flutter
+        run: sudo snap install flutter --classic
+      
+      - name: Fetch dependencies
+        run: flutter pub get
+
+      - name: Lint Code Base
+        run: flutter analyze
diff --git a/sonar-project.properties b/sonar-project.properties
index 3c396f3..be7208b 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,15 +1,13 @@
 sonar.projectKey=InnoSWP_bs2102-cv-parser
 sonar.organization=innoswp
 
-sonar.c.file.suffixes=-
-sonar.cpp.file.suffixes=-
-sonar.objc.file.suffixes=-
+
 # This is the name and version displayed in the SonarCloud UI.
-#sonar.projectName=bs2102-cv-parser
-#sonar.projectVersion=1.0
+sonar.projectName=bs2102-cv-parser
+sonar.projectVersion=1.0
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
-sonar.sources=.
+sonar.sources=lib
 
 # Encoding of the source code. Default is default system encoding
-#sonar.sourceEncoding=UTF-8
+sonar.sourceEncoding=UTF-8