code reorg
reorg complete, fix batch delete issue
rename uppercase to lowercase