folder reorg
remove unused spechelper
refactoring