Updated to match new Builder/Submitter interfaces
Moved Configuration into its own package