Final Chang over commit.

After this everything will be moved from Devon's server.