refactor/reorg to assettasks structure