reorg

reorganization of the project to simplify