Move config completely into the classes