Clean up and split configuration more fully from configurationengine