Folders Reorg
Folders reorg
unit test and some corrections