restructure, cleanup, more doc, prepare 01