More modularization with configf 98% done