Forgot 1 change
Merge branch '1.0.x'
Continue cleanup, move some files around
More cleanup