Removed deprecates code.
Repo reorg, separated Edwards' code and my own.