Added chaptering support

removed obsolete classes