WIP: Refactoring config package
WIP:refactor config