start clean up and modularization

just some notes to get started next time