diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f5da849..0b66b992 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -84,7 +84,7 @@ N/A
### Changed
-- **aiken**: Project structure is now a bit different. See [examples/sample](https://github.com/txpipe/aiken/tree/main/examples/sample) for more
+- **aiken**: Project structure is now a bit different. See [examples/sample](https://github.com/aiken-lang/aiken/tree/main/examples/sample) for more
## [v0.0.21] - 2022-10-23
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 43ae2bb3..879e0ace 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,14 +11,14 @@
2. **Documentation**
Any updates, typo fixes, or expansion of the documention is more than welcome. At the moment,
- we are using [mdBook](https://github.com/rust-lang/mdBook) to run https://txpipe.github.io/aiken.
+ we are using [nextra](https://nextra.site) to run https://github.com/aiken-lang/site.
That can be considered user level documentation but that is not strict. There is also doc comments in the Rust code, which can be considered strictly developer level documentation.
3. **Code**
**Getting started**
- - `git clone git@github.com:txpipe/aiken.git`
+ - `git clone git@github.com:aiken-lang/aiken.git`
- `cd aiken`
- `cargo test`
- `cargo run -- help`
@@ -81,11 +81,11 @@
### :bug: How To Report A Bug
-Open a [Bug Issue](https://github.com/txpipe/aiken/issues/new?template=bug.md).
+Open a [Bug Issue](https://github.com/aiken-lang/aiken/issues/new?template=bug.md).
### :bulb: How To Propose An Idea
-Feel free to bring any idea as a [discussion [category: idea]](https://github.com/txpipe/aiken/discussions/new?category=ideas). Make sure to highlight your use case so we can understand the design space and agree on a solution.
+Feel free to bring any idea as a [discussion [category: idea]](https://github.com/aiken-lang/aiken/discussions/new?category=ideas). Make sure to highlight your use case so we can understand the design space and agree on a solution.
> **Note** Ideally, follow this simple template:
>
@@ -95,7 +95,7 @@ Feel free to bring any idea as a [discussion [category: idea]](https://github.co
### :question: How To Ask a Question
-Open a [Q&A Discussion](https://github.com/txpipe/aiken/discussions/new?category=q-a).
+Open a [Q&A Discussion](https://github.com/aiken-lang/aiken/discussions/new?category=q-a).
> Make sure to mark your question as _Answered_ once resolved!
diff --git a/README.md b/README.md
index 577bc2ff..8f4769cf 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-

-

+

+
Cardano smart contract language and toolchain
-[](https://github.com/txpipe/aiken/blob/main/LICENSE)
+[](https://github.com/aiken-lang/aiken/blob/main/LICENSE)
[](https://crates.io/crates/aiken)
-[](https://github.com/txpipe/aiken/actions/workflows/rust.yml)
+[](https://github.com/aiken-lang/aiken/actions/workflows/rust.yml)
@@ -39,18 +39,13 @@ For more information please see the [user manual](https://aiken-lang.org).
## Roadmap
-Aiken defines its roadmap [using _Github Milestones_](https://txpipe.github.io/aiken/introduction.html#roadmap).
+Aiken defines its roadmap [using _Github Milestones_](https://aiken-lang.org/#roadmap).
The roadmap isn't set in stone, but gives a high-level overview of where the project is headed for.
## Contributing
Want to contribute? See [CONTRIBUTING.md](./CONTRIBUTING.md) to know how.
-## Acknowledgment
-
-We'd like to give a special thanks to [@nkz](https://twitter.com/nkzthecreator)
-for creating the logo and giving us the idea to name the project Aiken.
-
---
> **Note**
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index a6f9215c..139bdc56 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -3,8 +3,8 @@ name = "aiken"
description = "Cardano smart contract language and toolchain"
version = "0.0.26"
edition = "2021"
-repository = "https://github.com/txpipe/aiken"
-homepage = "https://github.com/txpipe/aiken"
+repository = "https://github.com/aiken-lang/aiken"
+homepage = "https://github.com/aiken-lang/aiken"
license = "Apache-2.0"
authors = ["Lucas Rosa ", "Kasey White "]
diff --git a/crates/flat/Cargo.toml b/crates/flat/Cargo.toml
index 529d87a8..517a91b6 100644
--- a/crates/flat/Cargo.toml
+++ b/crates/flat/Cargo.toml
@@ -3,8 +3,8 @@ name = "flat-rs"
description = "Flat codec"
version = "0.0.21"
edition = "2021"
-repository = "https://github.com/txpipe/aiken/crates/flat"
-homepage = "https://github.com/txpipe/aiken"
+repository = "https://github.com/aiken-lang/aiken/crates/flat"
+homepage = "https://github.com/aiken-lang/aiken"
license = "Apache-2.0"
authors = ["Lucas Rosa ", "Kasey White "]
diff --git a/crates/lang/Cargo.toml b/crates/lang/Cargo.toml
index 4eb485ab..a3648b27 100644
--- a/crates/lang/Cargo.toml
+++ b/crates/lang/Cargo.toml
@@ -3,8 +3,8 @@ name = "aiken-lang"
description = "The aiken compiler"
version = "0.0.26"
edition = "2021"
-repository = "https://github.com/txpipe/aiken"
-homepage = "https://github.com/txpipe/aiken"
+repository = "https://github.com/aiken-lang/aiken"
+homepage = "https://github.com/aiken-lang/aiken"
license = "Apache-2.0"
authors = ["Lucas Rosa ", "Kasey White "]
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
index a07ef628..33e83720 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/lsp/Cargo.toml
@@ -3,8 +3,8 @@ name = "aiken-lsp"
version = "0.0.26"
edition = "2021"
description = "Cardano smart contract language and toolchain"
-repository = "https://github.com/txpipe/aiken"
-homepage = "https://github.com/txpipe/aiken"
+repository = "https://github.com/aiken-lang/aiken"
+homepage = "https://github.com/aiken-lang/aiken"
license = "Apache-2.0"
authors = ["Lucas Rosa "]
diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml
index 5e61d066..01319cae 100644
--- a/crates/project/Cargo.toml
+++ b/crates/project/Cargo.toml
@@ -3,8 +3,8 @@ name = "aiken-project"
description = "Aiken project utilities"
version = "0.0.26"
edition = "2021"
-repository = "https://github.com/txpipe/aiken/crates/project"
-homepage = "https://github.com/txpipe/aiken"
+repository = "https://github.com/aiken-lang/aiken/crates/project"
+homepage = "https://github.com/aiken-lang/aiken"
license = "Apache-2.0"
authors = ["Lucas Rosa ", "Kasey White "]
diff --git a/crates/uplc/Cargo.toml b/crates/uplc/Cargo.toml
index d7c83891..058d6c61 100644
--- a/crates/uplc/Cargo.toml
+++ b/crates/uplc/Cargo.toml
@@ -3,8 +3,8 @@ name = "uplc"
description = "Utilities for working with Untyped Plutus Core"
version = "0.0.25"
edition = "2021"
-repository = "https://github.com/txpipe/aiken/crates/uplc"
-homepage = "https://github.com/txpipe/aiken"
+repository = "https://github.com/aiken-lang/aiken/crates/uplc"
+homepage = "https://github.com/aiken-lang/aiken"
license = "Apache-2.0"
authors = ["Lucas Rosa ", "Kasey White "]