moved config stuff under config, fix name mismatch on moduel syste