Userfrendly config modules & some refactoring