reorg directory architecture
reorg directory architecture
now we don't need makefiel anymore
alter design to match current need