BIG REORGANIZATION of dir structure. Now a config/extra allows for hotplugging extra configs easily