Add and rename

Add repository with fix deadlocks and rename other repositories.