cleanup

reorg folders other refactoring.