Consolidating files, making other changes ahead of v0.1.1 release