remove config modules and move them into the main modules