Move final changes from old repo