Make 1.0.0 and 1.1.0 have a more consistent structure, clean up comments and such; tests fail
Make 1.0.0 and 1.1.0 more consistent