reorganization, sample code, some docs