Adding generic conf, moving class stuff