updated docs, moved stray classes into Data_