conclude module refactoring. some minor fix. consumer disable ability improvement. clean dependency tree.