diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to .github/CODE_OF_CONDUCT.md
diff --git a/LICENSE b/LICENSE
index 902c7cc..ae88b75 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 infixint943
+Copyright (c) 2020 cp-tools
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index a7ccdcd..f2c317f 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,12 @@
     <br />
     Don't forget to :star: the project if you liked it!
     <br /><br />
-    <a href="https://travis-ci.com/github/infixint943/cf"><img src="https://img.shields.io/travis/com/infixint943/cf?style=for-the-badge"></a>
-    <a href="https://github.com/infixint943/cf/commits/master"><img src="https://img.shields.io/github/last-commit/infixint943/cf?style=for-the-badge"></a>
-    <a href="https://github.com/infixint943/cf/releases"><img src="https://img.shields.io/github/v/release/infixint943/cf?style=for-the-badge"></a>
-    <a href="https://github.com/infixint943/cf/issues"><img src="https://img.shields.io/github/issues/infixint943/cf?style=for-the-badge"></a>
-    <a href=""><img src="https://img.shields.io/github/go-mod/go-version/infixint943/cf?style=for-the-badge"></a>
-    <a href="https://github.com/infixint943/cf/blob/master/LICENSE"><img src="https://img.shields.io/github/license/infixint943/cf?style=for-the-badge"></a>
+    <a href="https://travis-ci.com/github/cp-tools/cf"><img src="https://img.shields.io/travis/com/cp-tools/cf?style=for-the-badge"></a>
+    <a href="https://github.com/cp-tools/cf/commits/master"><img src="https://img.shields.io/github/last-commit/cp-tools/cf?style=for-the-badge"></a>
+    <a href="https://github.com/cp-tools/cf/releases"><img src="https://img.shields.io/github/v/release/cp-tools/cf?style=for-the-badge"></a>
+    <a href="https://github.com/cp-tools/cf/issues"><img src="https://img.shields.io/github/issues/cp-tools/cf?style=for-the-badge"></a>
+    <a href=""><img src="https://img.shields.io/github/go-mod/go-version/cp-tools/cf?style=for-the-badge"></a>
+    <a href="https://github.com/cp-tools/cf/blob/master/LICENSE"><img src="https://img.shields.io/github/license/cp-tools/cf?style=for-the-badge"></a>
 </h4>
 
 
@@ -37,20 +37,20 @@
 
 # Installation
 
-You may download the latest, compiled, binary files from [here](https://github.com/infixint943/cf/releases).
+You may download the latest, compiled, binary files from [here](https://github.com/cp-tools/cf/releases).
 Place the executable in system **PATH** to invoke the tool from any directory.
 
 Alternatively, you can also compile the tool from source.
 
 ```bash
-git clone https://github.com/infixint943/cf.git
+git clone https://github.com/cp-tools/cf.git
 cd cf/
 go build -ldflags "-s -w"
 ```
 
 # Quick Start
 
-**Note:** For detailed documentation, please head to the [wiki](https://github.com/infixint943/cf/wiki) page.
+**Note:** For detailed documentation, please head to the [wiki](https://github.com/cp-tools/cf/wiki) page.
 
 > Let's simulate participating in contest `4`. This tutorial assumes you have already configured your login details and added at least one template, through `cf config` 
 
diff --git a/client/fetch.go b/client/fetch.go
index cbf1eb6..a62bf5f 100644
--- a/client/fetch.go
+++ b/client/fetch.go
@@ -58,7 +58,6 @@ func FetchProbs(contest string, link url.URL) ([]string, error) {
 // Returns 2d slice mapping to input and output
 // If problem == "", fetch all problem test cases
 // else, only fetch of given problem.
-// fix for https://github.com/infixint943/cf/pull/2#issuecomment-626122011
 func FetchTests(contest, problem string, link url.URL) ([][]string, [][]string, error) {
 
 	c := cfg.Session.Client
diff --git a/cmd/config.go b/cmd/config.go
index 14025f3..c755745 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -83,7 +83,7 @@ func addTmplt() {
 	for name := range cln.LangID {
 		lName = append(lName, name)
 	}
-	pkg.Log.Info("For detailed instructions, read https://github.com/infixint943/cf/wiki/Configuration")
+	pkg.Log.Info("For detailed instructions, read https://github.com/cp-tools/cf/wiki/Configuration")
 	tmplt := cfg.Template{}
 	err := survey.Ask([]*survey.Question{
 		{
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
index 55bcf7b..c7cb33a 100644
--- a/cmd/upgrade.go
+++ b/cmd/upgrade.go
@@ -18,7 +18,7 @@ func RunUpgrade() {
 	// parse current version
 	cVers := semver.MustParse(Version)
 	// determine latest release version using github API
-	link := "https://api.github.com/repos/infixint943/cf/releases/latest"
+	link := "https://api.github.com/repos/cp-tools/cf/releases/latest"
 	resp, err := pkg.GetReqBody(&http.Client{}, link)
 	pkg.PrintError(err, "Failed to fetch latest release")
 
@@ -48,7 +48,7 @@ func RunUpgrade() {
 		return
 	}
 	// url of tar file to download
-	link = fmt.Sprintf("https://github.com/infixint943/cf/releases/download/%v/cf_%v_%v.tar.gz",
+	link = fmt.Sprintf("https://github.com/cp-tools/cf/releases/download/%v/cf_%v_%v.tar.gz",
 		latest, runtime.GOOS, runtime.GOARCH)
 
 	pkg.Log.Info("Downloading update. Please wait.")