project reorg
fixed assembly