update description
reorg modules
started implementing core