Documentation, minor structure changes