diff --git a/README.md b/README.md
index 2635ed2..6783d1a 100644
--- a/README.md
+++ b/README.md
@@ -8,18 +8,43 @@
 
 ## 5 Weeks Of Python (Roadmap)
 
-<details>
-<summary>Week 1</summary>
 
-1. Print
-2. Variables: Numeric
-3. Variables: String
-4. Dates
-5. Error Handling
-6. Conditions
-7. Multiple Conditions
+## Week 1: Environment Setup and Introduction
+
+### Downloading Python
+Python comes pre-installed on Linux OS. For Windows you will have to Download.
+Download Python [here](https://www.python.org/downloads/)
+
+### Resources
+[Python For Beginnes](https://docs.microsoft.com/en-us/windows/python/beginners)
+
+### Text Editors
+
+Use a text-editor of your choice:
+
+Recommended are:
+
+[Visual Studio Code](https://code.visualstudio.com/)
+[Atom](https://atom.io/)
+[Sublime Text](https://www.sublimetext.com/)
+
+### Git and GitHub Setup.
+
+Note that you have to pass the challenges in git and github to proceed to the next stages.
+They are essential tools in development for code sharing and collaboration.
+
+[Get Started Here](git-github-setup.md)
+
+[Raise an Issue if encountering a blocker](https://github.com/ZetechUni/python-bootcamp/issues/new)
+
+## Practice Code
+
+1. [Print](source/week-1/print)
+2. [Variables](source/week-1/variables)
+3. [Dates](source/week-1/dates)
+4. [Error Handling](source/week-1/error-handling)
+5. [Conditions](source/week-1/conditions)
 
-</details>
 
 <details>
 <summary>Week 2</summary>
diff --git a/git-github-setup.md b/git-github-setup.md
new file mode 100644
index 0000000..390dd2c
--- /dev/null
+++ b/git-github-setup.md
@@ -0,0 +1,68 @@
+# GitHub Setup
+
+> GitHub offers the distributed version control and source code management and collaboration.
+
+**Below are resources to getting started with GitHub.**
+
+> You are supposed to complete the practical activities after going through the resources for you to qualify to the next stage.
+
+| Be sure to have the basic knowledge of using github: |
+|--|
+| Creating a repository |
+| Forking a repository |
+| Updating a Forked Repository |
+| Creating a Branch |
+| Creating a Pull Request |
+| Creating a Issues |
+
+## GitHub Basics
+
+1. [Official Guides by GitHub](https://guides.github.com/)
+2. [Creating a Repository](https://guides.github.com/activities/hello-world/)
+3. [Getting Started With GitHub](https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github)
+
+## Git Setup
+
+What is git?
+Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
+
+Resources:
+
+[git-scm website](https://git-scm.com/)
+[Downloading git](https://git-scm.com/download)
+[Configuring git with GitHub](https://chrisdev.hashnode.dev/git-and-github-installation-and-configuration)
+
+## Practical Activities
+
+### Activity 1:
+
+- Create a GitHub Repository using your account.
+- Clone the repository to your local environment, using either git or gh-cli.
+- Create a new file: 
+  
+  >Use the following naming convection: {github-username}.txt
+- Add the following details to the created file: 
+
+    >your github username and your github email
+
+- Update your repository using `git`. 
+    
+    i.e: 
+
+    ```shell
+    git add .
+    git commit -m "your commit message"
+    git push
+    ```
+
+    N.B Use a better commit message.
+
+### Activity 2
+
+- Head over to https://github.com/ZetechUni/github-collaborations
+- Fork the repository
+- Create a new branch using the following naming convection: ({github-username}-patch)
+- Add your details in the README.md under the "Contributors" title.
+- Update your repository.
+- Create a pull request.
+- After creating a pull request, create an issue:
\ No newline at end of file
diff --git a/source/week-1/multilpe-conditions/add_else_to_elif.py b/source/week-1/conditions/multilpe-conditions/add_else_to_elif.py
similarity index 100%
rename from source/week-1/multilpe-conditions/add_else_to_elif.py
rename to source/week-1/conditions/multilpe-conditions/add_else_to_elif.py
diff --git a/source/week-1/multilpe-conditions/code_challenge.py b/source/week-1/conditions/multilpe-conditions/code_challenge.py
similarity index 100%
rename from source/week-1/multilpe-conditions/code_challenge.py
rename to source/week-1/conditions/multilpe-conditions/code_challenge.py
diff --git a/source/week-1/multilpe-conditions/code_challenge_solution.py b/source/week-1/conditions/multilpe-conditions/code_challenge_solution.py
similarity index 100%
rename from source/week-1/multilpe-conditions/code_challenge_solution.py
rename to source/week-1/conditions/multilpe-conditions/code_challenge_solution.py
diff --git a/source/week-1/multilpe-conditions/multiple_if_statements.py b/source/week-1/conditions/multilpe-conditions/multiple_if_statements.py
similarity index 100%
rename from source/week-1/multilpe-conditions/multiple_if_statements.py
rename to source/week-1/conditions/multilpe-conditions/multiple_if_statements.py
diff --git a/source/week-1/multilpe-conditions/nested_if.py b/source/week-1/conditions/multilpe-conditions/nested_if.py
similarity index 100%
rename from source/week-1/multilpe-conditions/nested_if.py
rename to source/week-1/conditions/multilpe-conditions/nested_if.py
diff --git a/source/week-1/multilpe-conditions/or_statements.py b/source/week-1/conditions/multilpe-conditions/or_statements.py
similarity index 100%
rename from source/week-1/multilpe-conditions/or_statements.py
rename to source/week-1/conditions/multilpe-conditions/or_statements.py
diff --git a/source/week-1/multilpe-conditions/use_elif.py b/source/week-1/conditions/multilpe-conditions/use_elif.py
similarity index 100%
rename from source/week-1/multilpe-conditions/use_elif.py
rename to source/week-1/conditions/multilpe-conditions/use_elif.py
diff --git a/source/week-1/multilpe-conditions/use_in_statements.py b/source/week-1/conditions/multilpe-conditions/use_in_statements.py
similarity index 100%
rename from source/week-1/multilpe-conditions/use_in_statements.py
rename to source/week-1/conditions/multilpe-conditions/use_in_statements.py
diff --git a/source/week-1/conditions/add_else.py b/source/week-1/conditions/single/add_else.py
similarity index 100%
rename from source/week-1/conditions/add_else.py
rename to source/week-1/conditions/single/add_else.py
diff --git a/source/week-1/conditions/add_else_different_indentation.py b/source/week-1/conditions/single/add_else_different_indentation.py
similarity index 100%
rename from source/week-1/conditions/add_else_different_indentation.py
rename to source/week-1/conditions/single/add_else_different_indentation.py
diff --git a/source/week-1/conditions/case_insensitive_comparisons.py b/source/week-1/conditions/single/case_insensitive_comparisons.py
similarity index 100%
rename from source/week-1/conditions/case_insensitive_comparisons.py
rename to source/week-1/conditions/single/case_insensitive_comparisons.py
diff --git a/source/week-1/conditions/check_tax.py b/source/week-1/conditions/single/check_tax.py
similarity index 100%
rename from source/week-1/conditions/check_tax.py
rename to source/week-1/conditions/single/check_tax.py
diff --git a/source/week-1/conditions/code_challenge.py b/source/week-1/conditions/single/code_challenge.py
similarity index 100%
rename from source/week-1/conditions/code_challenge.py
rename to source/week-1/conditions/single/code_challenge.py
diff --git a/source/week-1/conditions/code_challenge_solution.py b/source/week-1/conditions/single/code_challenge_solution.py
similarity index 100%
rename from source/week-1/conditions/code_challenge_solution.py
rename to source/week-1/conditions/single/code_challenge_solution.py
diff --git a/source/week-1/conditions/comparing_strings.py b/source/week-1/conditions/single/comparing_strings.py
similarity index 100%
rename from source/week-1/conditions/comparing_strings.py
rename to source/week-1/conditions/single/comparing_strings.py
diff --git a/source/week-1/numeric-variables/code_challenge.py b/source/week-1/variables/numeric-variables/code_challenge.py
similarity index 100%
rename from source/week-1/numeric-variables/code_challenge.py
rename to source/week-1/variables/numeric-variables/code_challenge.py
diff --git a/source/week-1/numeric-variables/code_challenge_solution.py b/source/week-1/variables/numeric-variables/code_challenge_solution.py
similarity index 100%
rename from source/week-1/numeric-variables/code_challenge_solution.py
rename to source/week-1/variables/numeric-variables/code_challenge_solution.py
diff --git a/source/week-1/numeric-variables/declare-variables.py b/source/week-1/variables/numeric-variables/declare-variables.py
similarity index 100%
rename from source/week-1/numeric-variables/declare-variables.py
rename to source/week-1/variables/numeric-variables/declare-variables.py
diff --git a/source/week-1/numeric-variables/doing_math.py b/source/week-1/variables/numeric-variables/doing_math.py
similarity index 100%
rename from source/week-1/numeric-variables/doing_math.py
rename to source/week-1/variables/numeric-variables/doing_math.py
diff --git a/source/week-1/numeric-variables/numbers_treated_as_strings.py b/source/week-1/variables/numeric-variables/numbers_treated_as_strings.py
similarity index 100%
rename from source/week-1/numeric-variables/numbers_treated_as_strings.py
rename to source/week-1/variables/numeric-variables/numbers_treated_as_strings.py
diff --git a/source/week-1/numeric-variables/string-to-num.py b/source/week-1/variables/numeric-variables/string-to-num.py
similarity index 100%
rename from source/week-1/numeric-variables/string-to-num.py
rename to source/week-1/variables/numeric-variables/string-to-num.py
diff --git a/source/week-1/numeric-variables/strings-and-num.py b/source/week-1/variables/numeric-variables/strings-and-num.py
similarity index 100%
rename from source/week-1/numeric-variables/strings-and-num.py
rename to source/week-1/variables/numeric-variables/strings-and-num.py
diff --git a/source/week-1/string-variables/code_challenge.py b/source/week-1/variables/string-variables/code_challenge.py
similarity index 100%
rename from source/week-1/string-variables/code_challenge.py
rename to source/week-1/variables/string-variables/code_challenge.py
diff --git a/source/week-1/string-variables/code_challenge_solution.py b/source/week-1/variables/string-variables/code_challenge_solution.py
similarity index 100%
rename from source/week-1/string-variables/code_challenge_solution.py
rename to source/week-1/variables/string-variables/code_challenge_solution.py
diff --git a/source/week-1/string-variables/combine_strings.py b/source/week-1/variables/string-variables/combine_strings.py
similarity index 100%
rename from source/week-1/string-variables/combine_strings.py
rename to source/week-1/variables/string-variables/combine_strings.py
diff --git a/source/week-1/string-variables/format_strings.py b/source/week-1/variables/string-variables/format_strings.py
similarity index 100%
rename from source/week-1/string-variables/format_strings.py
rename to source/week-1/variables/string-variables/format_strings.py
diff --git a/source/week-1/string-variables/string_functions.py b/source/week-1/variables/string-variables/string_functions.py
similarity index 100%
rename from source/week-1/string-variables/string_functions.py
rename to source/week-1/variables/string-variables/string_functions.py
diff --git a/source/week-1/string-variables/strings_in_variables.py b/source/week-1/variables/string-variables/strings_in_variables.py
similarity index 100%
rename from source/week-1/string-variables/strings_in_variables.py
rename to source/week-1/variables/string-variables/strings_in_variables.py