Re-align the project

See title