reorganize and preliminary charting prototype