Some structural and documentational changes