It was not properly including the "config_common" files, and was causing it to break on the configurator. Additionally, updated this to use the split common code.
