[java-identity-provider] branch master updated: IDP-1642 - Migrate configuration into jars where feasible

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=2b4716f472ba4c5a19002e988181f57951a1d797

The following commit(s) were added to refs/heads/master by this push:
       new  2b4716f47 IDP-1642 - Migrate configuration into jars where feasible
2b4716f47 is described below

commit 2b4716f472ba4c5a19002e988181f57951a1d797
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 27 12:04:20 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Move flows and initially migrated views into new idp-conf-impl module
---
 idp-conf-impl/.checkstyle                          |  15 +
 idp-conf-impl/.classpath                           |  38 ++
 idp-conf-impl/.gitignore                           |  21 ++
 idp-conf-impl/.project                             |  23 ++
 .../.settings/org.eclipse.core.resources.prefs     |   6 +
 idp-conf-impl/.settings/org.eclipse.jdt.core.prefs | 413 +++++++++++++++++++++
 idp-conf-impl/.settings/org.eclipse.jdt.ui.prefs   |  63 ++++
 idp-conf-impl/.settings/org.eclipse.m2e.core.prefs |   4 +
 idp-conf-impl/pom.xml                              |  72 ++++
 idp-conf-impl/src/main/java/.gitkeep               |   0
 idp-conf-impl/src/main/resources/.gitkeep          |   0
 .../idp/flows/admin}/admin-abstract-beans.xml      |   0
 .../idp/flows/admin}/admin-abstract-flow.xml       |   2 +-
 .../shibboleth/idp/flows/admin}/hello-beans.xml    |   0
 .../net/shibboleth/idp/flows/admin}/hello-flow.xml |   0
 .../shibboleth/idp/flows/admin}/lockout-beans.xml  |   0
 .../shibboleth/idp/flows/admin}/lockout-flow.xml   |   0
 .../shibboleth/idp/flows/admin}/mdquery-beans.xml  |   0
 .../shibboleth/idp/flows/admin}/mdquery-flow.xml   |   2 +-
 .../shibboleth/idp/flows/admin}/metrics-beans.xml  |   0
 .../shibboleth/idp/flows/admin}/metrics-flow.xml   |   0
 .../idp/flows/admin}/reload-metadata-beans.xml     |   0
 .../idp/flows/admin}/reload-metadata-flow.xml      |   0
 .../idp/flows/admin}/reload-service-beans.xml      |   0
 .../idp/flows/admin}/reload-service-flow.xml       |   0
 .../idp/flows/admin}/resolvertest-beans.xml        |   0
 .../idp/flows/admin}/resolvertest-flow.xml         |   2 +-
 .../shibboleth/idp/flows/admin}/status-beans.xml   |   0
 .../shibboleth/idp/flows/admin}/status-flow.xml    |   0
 .../shibboleth/idp/flows/admin}/storage-beans.xml  |   0
 .../shibboleth/idp/flows/admin}/storage-flow.xml   |   0
 .../idp/flows/admin}/unlock-keys-beans.xml         |   0
 .../idp/flows/admin}/unlock-keys-flow.xml          |   0
 .../idp/flows/authn}/authn-abstract-flow.xml       |   0
 .../shibboleth/idp/flows/authn}/authn-beans.xml    |   0
 .../net/shibboleth/idp/flows/authn}/authn-flow.xml |   0
 .../idp/flows/authn}/discovery-beans.xml           |   0
 .../shibboleth/idp/flows/authn}/discovery-flow.xml |   0
 .../idp/flows/authn}/duo-authn-beans.xml           |   0
 .../shibboleth/idp/flows/authn}/duo-authn-flow.xml |   0
 .../idp/flows/authn}/external-authn-beans.xml      |   0
 .../idp/flows/authn}/external-authn-flow.xml       |   0
 .../idp/flows/authn}/function-authn-beans.xml      |   0
 .../idp/flows/authn}/function-authn-flow.xml       |   0
 .../idp/flows/authn}/ipaddress-authn-beans.xml     |   0
 .../idp/flows/authn}/ipaddress-authn-flow.xml      |   0
 .../idp/flows/authn}/mfa-authn-beans.xml           |   0
 .../shibboleth/idp/flows/authn}/mfa-authn-flow.xml |   0
 .../idp/flows/authn}/password-authn-beans.xml      |   0
 .../idp/flows/authn}/password-authn-flow.xml       |   0
 .../idp/flows/authn}/remoteuser-authn-beans.xml    |   0
 .../idp/flows/authn}/remoteuser-authn-flow.xml     |   0
 .../authn}/remoteuser-internal-authn-beans.xml     |   0
 .../authn}/remoteuser-internal-authn-flow.xml      |   0
 .../idp}/flows/authn/saml-authn-beans.xml          |   0
 .../idp}/flows/authn/saml-authn-flow.xml           |   0
 .../idp/flows/authn}/spnego-authn-beans.xml        |   0
 .../idp/flows/authn}/spnego-authn-flow.xml         |   0
 .../idp/flows/authn}/x509-authn-beans.xml          |   0
 .../idp/flows/authn}/x509-authn-flow.xml           |   0
 .../idp/flows/authn}/x509-internal-authn-beans.xml |   0
 .../idp/flows/authn}/x509-internal-authn-flow.xml  |   0
 .../c14n}/attribute-sourced-subject-c14n-beans.xml |   0
 .../c14n}/attribute-sourced-subject-c14n-flow.xml  |   0
 .../idp/flows/c14n}/simple-subject-c14n-beans.xml  |   0
 .../idp/flows/c14n}/simple-subject-c14n-flow.xml   |   0
 .../idp/flows/c14n}/subject-c14n-abstract-flow.xml |   0
 .../idp/flows/c14n}/subject-c14n-beans.xml         |   0
 .../idp/flows/c14n}/subject-c14n-flow.xml          |   0
 .../flows/c14n/subject-c14n-saml-default-beans.xml |   0
 .../flows/c14n/subject-c14n-saml-default-flow.xml  |   0
 .../idp/flows/c14n}/x500-subject-c14n-beans.xml    |   0
 .../idp/flows/c14n}/x500-subject-c14n-flow.xml     |   0
 .../idp/flows/cas}/cas-abstract-beans.xml          |   0
 .../idp/flows/cas}/cas-abstract-flow.xml           |   2 +-
 .../net/shibboleth/idp/flows/cas}/login-beans.xml  |   0
 .../net/shibboleth/idp/flows/cas}/login-flow.xml   |   0
 .../idp/flows/cas}/logout/cas-logoutprop-flow.xml  |   0
 .../net/shibboleth/idp/flows/cas}/proxy-beans.xml  |   0
 .../net/shibboleth/idp/flows/cas}/proxy-flow.xml   |   0
 .../idp/flows/cas}/proxyValidate-beans.xml         |   0
 .../idp/flows/cas}/proxyValidate-flow.xml          |   0
 .../idp/flows/cas}/samlValidate-beans.xml          |   0
 .../idp/flows/cas}/samlValidate-flow.xml           |   0
 .../idp/flows/cas}/serviceValidate-beans.xml       |   0
 .../idp/flows/cas}/serviceValidate-flow.xml        |   0
 .../idp/flows/cas}/validate-abstract-beans.xml     |   0
 .../idp/flows/cas}/validate-abstract-flow.xml      |   2 +-
 .../shibboleth/idp/flows/cas}/validate-beans.xml   |   0
 .../shibboleth/idp/flows/cas}/validate-flow.xml    |   0
 .../client-storage}/client-storage-read-beans.xml  |   0
 .../client-storage}/client-storage-read-flow.xml   |   0
 .../client-storage}/client-storage-write-beans.xml |   0
 .../client-storage}/client-storage-write-flow.xml  |   0
 .../flows/intercept}/attribute-release-beans.xml   |   0
 .../flows/intercept}/attribute-release-flow.xml    |   0
 .../intercept}/attribute-release-query-beans.xml   |   0
 .../intercept}/attribute-release-query-flow.xml    |   0
 .../idp}/flows/intercept/context-check-beans.xml   |   0
 .../idp}/flows/intercept/context-check-flow.xml    |   0
 .../flows/intercept/expiring-password-beans.xml    |   0
 .../flows/intercept/expiring-password-flow.xml     |   0
 .../idp}/flows/intercept/external-beans.xml        |   0
 .../idp}/flows/intercept/external-flow.xml         |   0
 .../idp}/flows/intercept/impersonate-beans.xml     |   0
 .../idp}/flows/intercept/impersonate-flow.xml      |   0
 .../flows/intercept/intercept-abstract-flow.xml    |   0
 .../idp}/flows/intercept/intercept-beans.xml       |   0
 .../idp}/flows/intercept/intercept-flow.xml        |   0
 .../idp/flows/intercept}/terms-of-use-beans.xml    |   0
 .../idp/flows/intercept}/terms-of-use-flow.xml     |   0
 .../idp}/flows/intercept/warning-beans.xml         |   0
 .../idp}/flows/intercept/warning-flow.xml          |   0
 .../shibboleth/idp}/flows/logout/logout-beans.xml  |   0
 .../shibboleth/idp}/flows/logout/logout-flow.xml   |   0
 .../idp}/flows/logout/logout-propagation-beans.xml |   0
 .../idp}/flows/logout/logout-propagation-flow.xml  |   0
 .../flows/saml}/logout/saml2-logoutprop-beans.xml  |   0
 .../flows/saml}/logout/saml2-logoutprop-flow.xml   |   0
 .../idp/flows/saml}/saml-abstract-beans.xml        |   0
 .../idp/flows/saml}/saml-abstract-flow.xml         |   2 +-
 .../saml}/saml1/artifact-resolution-beans.xml      |   0
 .../flows/saml}/saml1/artifact-resolution-flow.xml |   0
 .../flows/saml}/saml1/attribute-query-beans.xml    |   0
 .../idp/flows/saml}/saml1/attribute-query-flow.xml |   0
 .../idp/flows/saml}/saml1/common-beans.xml         |   0
 .../idp/flows/saml}/saml1/sso-abstract-beans.xml   |   0
 .../idp/flows/saml}/saml1/sso-abstract-flow.xml    |   2 +-
 .../idp/flows/saml}/saml1/sso-security-flow.xml    |   0
 .../flows/saml}/saml1/sso-unsolicited-beans.xml    |   0
 .../idp/flows/saml}/saml1/sso-unsolicited-flow.xml |   0
 .../saml}/saml2/artifact-resolution-beans.xml      |   0
 .../flows/saml}/saml2/artifact-resolution-flow.xml |   0
 .../flows/saml}/saml2/attribute-query-beans.xml    |   0
 .../idp/flows/saml}/saml2/attribute-query-flow.xml |   0
 .../idp/flows/saml}/saml2/common-beans.xml         |   0
 .../idp/flows/saml}/saml2/ecp-security-flow.xml    |   0
 .../idp/flows/saml}/saml2/idwsf-ssos-beans.xml     |   0
 .../idp/flows/saml}/saml2/idwsf-ssos-flow.xml      |   0
 .../saml}/saml2/idwsf-ssos-security-beans.xml      |   0
 .../flows/saml}/saml2/idwsf-ssos-security-flow.xml |   0
 .../idp/flows/saml}/saml2/slo-artifact-beans.xml   |   0
 .../idp/flows/saml}/saml2/slo-artifact-flow.xml    |   0
 .../idp/flows/saml}/saml2/slo-back-beans.xml       |   0
 .../idp/flows/saml}/saml2/slo-back-flow.xml        |   0
 .../flows/saml}/saml2/slo-front-abstract-beans.xml |   0
 .../flows/saml}/saml2/slo-front-abstract-flow.xml  |   2 +-
 .../idp/flows/saml}/saml2/slo-post-beans.xml       |   0
 .../idp/flows/saml}/saml2/slo-post-flow.xml        |   0
 .../saml}/saml2/slo-post-simplesign-beans.xml      |   0
 .../flows/saml}/saml2/slo-post-simplesign-flow.xml |   0
 .../idp/flows/saml}/saml2/slo-redirect-beans.xml   |   0
 .../idp/flows/saml}/saml2/slo-redirect-flow.xml    |   0
 .../idp/flows/saml}/saml2/slo-security-flow.xml    |   0
 .../idp/flows/saml}/saml2/sso-abstract-beans.xml   |   0
 .../idp/flows/saml}/saml2/sso-abstract-flow.xml    |   2 +-
 .../idp/flows/saml}/saml2/sso-artifact-beans.xml   |   0
 .../idp/flows/saml}/saml2/sso-artifact-flow.xml    |   0
 .../idp/flows/saml}/saml2/sso-ecp-beans.xml        |   0
 .../idp/flows/saml}/saml2/sso-ecp-flow.xml         |   0
 .../idp/flows/saml}/saml2/sso-post-beans.xml       |   0
 .../idp/flows/saml}/saml2/sso-post-flow.xml        |   0
 .../saml}/saml2/sso-post-simplesign-beans.xml      |   0
 .../flows/saml}/saml2/sso-post-simplesign-flow.xml |   0
 .../idp/flows/saml}/saml2/sso-redirect-beans.xml   |   0
 .../idp/flows/saml}/saml2/sso-redirect-flow.xml    |   0
 .../idp/flows/saml}/saml2/sso-security-flow.xml    |   0
 .../flows/saml}/saml2/sso-unsolicited-beans.xml    |   0
 .../idp/flows/saml}/saml2/sso-unsolicited-flow.xml |   0
 .../idp/flows/saml}/security-abstract-flow.xml     |   2 +-
 .../shibboleth/idp/flows/saml}/security-beans.xml  |   0
 .../idp/flows/saml}/soap-security-flow.xml         |   0
 .../net/shibboleth/idp/views/admin}/mdquery.vm     |   0
 .../shibboleth/idp/views/admin}/resolvertest.vm    |   0
 .../views/client-storage/local-storage-read.js     |   0
 .../views/client-storage/local-storage-write.js    |   0
 .../shibboleth/idp}/views/client-storage/read.vm   |   0
 .../shibboleth/idp}/views/client-storage/write.vm  |   0
 idp-conf-impl/src/test/java/.gitkeep               |   0
 idp-conf-impl/src/test/resources/logback-test.xml  |  17 +
 idp-conf/pom.xml                                   |  95 +----
 .../src/main/resources/system/conf/mvc-beans.xml   |   4 +-
 .../main/resources/system/conf/webflow-config.xml  | 186 +++++-----
 idp-parent/pom.xml                                 |   5 +-
 idp-profile-impl/pom.xml                           |  13 -
 idp-war/pom.xml                                    |   5 +
 186 files changed, 802 insertions(+), 198 deletions(-)

diff --git a/idp-conf-impl/.checkstyle b/idp-conf-impl/.checkstyle
new file mode 100644
index 000000000..d3fc685e1
--- /dev/null
+++ b/idp-conf-impl/.checkstyle
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+
+    <local-check-config name="Shibboleth Checkstyle" location="/idp-parent/resources/checkstyle/checkstyle.xml" type="project" description="">
+        <additional-data name="cache-file" value="true"/>
+        <additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
+        <additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
+    </local-check-config>
+  
+    <fileset name="main source" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
+        <file-match-pattern match-pattern="src/main/java/.*\.java$" include-pattern="true"/>
+    </fileset>
+  
+</fileset-config>
diff --git a/idp-conf-impl/.classpath b/idp-conf-impl/.classpath
new file mode 100644
index 000000000..0fb79cfe6
--- /dev/null
+++ b/idp-conf-impl/.classpath
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/idp-conf-impl/.gitignore b/idp-conf-impl/.gitignore
new file mode 100644
index 000000000..de412210c
--- /dev/null
+++ b/idp-conf-impl/.gitignore
@@ -0,0 +1,21 @@
+# A simulation of Subversion default ignores, generated by reposurgeon.
+*.o
+*.lo
+*.la
+*.al
+*.libs
+*.so
+*.so.[0-9]*
+*.a
+*.pyc
+*.pyo
+*.rej
+*.iml
+*~
+*.#*
+.*.swp
+.DS_store
+# Simulated Subversion default ignores end here
+
+/target
+/test-output
diff --git a/idp-conf-impl/.project b/idp-conf-impl/.project
new file mode 100644
index 000000000..21c7ec5fc
--- /dev/null
+++ b/idp-conf-impl/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+    <name>idp-conf-impl</name>
+    <comment></comment>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+        </buildCommand>
+        <buildCommand>
+            <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+        </buildCommand>
+        <buildCommand>
+            <name>org.eclipse.m2e.core.maven2Builder</name>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+        <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+        <nature>org.eclipse.m2e.core.maven2Nature</nature>
+    </natures>
+</projectDescription>
\ No newline at end of file
diff --git a/idp-conf-impl/.settings/org.eclipse.core.resources.prefs b/idp-conf-impl/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..29abf9995
--- /dev/null
+++ b/idp-conf-impl/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/idp-conf-impl/.settings/org.eclipse.jdt.core.prefs b/idp-conf-impl/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..af08edf91
--- /dev/null
+++ b/idp-conf-impl/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,413 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=ignore
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=info
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=info
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=info
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=16
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=1
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/idp-conf-impl/.settings/org.eclipse.jdt.ui.prefs b/idp-conf-impl/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..86c79c4bc
--- /dev/null
+++ b/idp-conf-impl/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,63 @@
+cleanup.add_default_serial_version_id=false
+cleanup.add_generated_serial_version_id=true
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=false
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=true
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=true
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=true
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_Shibboleth
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_Shibboleth
+formatter_settings_version=11
+internal.default.compliance=default
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=false
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Commen [...]
diff --git a/idp-conf-impl/.settings/org.eclipse.m2e.core.prefs b/idp-conf-impl/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/idp-conf-impl/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/idp-conf-impl/pom.xml b/idp-conf-impl/pom.xml
new file mode 100644
index 000000000..146b3862a
--- /dev/null
+++ b/idp-conf-impl/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>net.shibboleth.idp</groupId>
+        <artifactId>idp-parent</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+        <relativePath>../idp-parent</relativePath>
+    </parent>
+
+    <name>Shibboleth IdP :: System Configuration</name>
+    <description>System Configuration Files</description>
+    <artifactId>idp-conf-impl</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <automatic.module.name>net.shibboleth.idp.conf.impl</automatic.module.name>
+    </properties>
+
+    <dependencies>
+        <!-- Compile Dependencies -->
+
+        <!-- Provided Dependencies -->
+
+        <!-- Runtime Dependencies -->
+        <!-- Supports Eclipse class lookup from within flow files. -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-authn-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-cas-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-profile-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-saml-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-session-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-ui</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Test Dependencies -->
+
+        <!-- Managed Dependencies -->
+    </dependencies>
+    
+</project>
diff --git a/idp-conf-impl/src/main/java/.gitkeep b/idp-conf-impl/src/main/java/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/idp-conf-impl/src/main/resources/.gitkeep b/idp-conf-impl/src/main/resources/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-flow.xml
similarity index 98%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-flow.xml
index e0a455492..6b12f3cda 100644
--- a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/admin-abstract-flow.xml
@@ -144,5 +144,5 @@
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleError" />
     </global-transitions>
 
-    <bean-import resource="classpath:/net/shibboleth/idp/admin/flows/admin-abstract-beans.xml" />   
+    <bean-import resource="classpath:/net/shibboleth/idp/flows/admin/admin-abstract-beans.xml" />   
 </flow>
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/hello-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/hello-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/hello-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-flow.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/hello-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-flow.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/lockout-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/lockout-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/lockout-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-flow.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/lockout-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/lockout-flow.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/mdquery-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/mdquery-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/mdquery-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-flow.xml
similarity index 98%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/mdquery-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-flow.xml
index cc3af4c7b..19256e6df 100644
--- a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/mdquery-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/mdquery-flow.xml
@@ -36,7 +36,7 @@
         <transition on="proceed" to="ResponseView" />
     </action-state>
     
-    <end-state id="ResponseView" view="mdquery">
+    <end-state id="ResponseView" view="admin/mdquery">
         <on-entry>
             <evaluate expression="WriteAuditLog" />
             <evaluate expression="environment" result="requestScope.environment" />
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/metrics-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/metrics-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/metrics-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-flow.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/metrics-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/metrics-flow.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/reload-metadata-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/reload-metadata-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/reload-metadata-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-flow.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/reload-metadata-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-metadata-flow.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/reload-service-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/reload-service-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/reload-service-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-flow.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/reload-service-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/reload-service-flow.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/resolvertest-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/resolvertest-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/resolvertest-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-flow.xml
similarity index 98%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/resolvertest-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-flow.xml
index d938a90eb..d4ec50e50 100644
--- a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/resolvertest-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/resolvertest-flow.xml
@@ -94,7 +94,7 @@
         <transition on="proceed" to="ResponseView" />
     </action-state>
     
-    <end-state id="ResponseView" view="resolvertest">
+    <end-state id="ResponseView" view="admin/resolvertest">
         <on-entry>
             <evaluate expression="WriteAuditLog" />
             <evaluate expression="environment" result="requestScope.environment" />
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/status-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/status-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/status-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-flow.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/status-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/status-flow.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/storage-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/storage-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/storage-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-flow.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/storage-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/storage-flow.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/unlock-keys-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/unlock-keys-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-beans.xml
diff --git a/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/unlock-keys-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-flow.xml
similarity index 100%
rename from idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/unlock-keys-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/unlock-keys-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-abstract-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/discovery-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/discovery-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/discovery-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/discovery-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/discovery-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/duo-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/duo-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/duo-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/duo-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/duo-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/duo-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/duo-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/duo-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/external-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/external-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/external-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/external-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/function-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/function-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/function-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/function-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/function-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/function-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/function-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/function-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/ipaddress-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/ipaddress-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/ipaddress-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/ipaddress-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/ipaddress-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/mfa-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/mfa-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/mfa-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/mfa-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/mfa-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/mfa-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/mfa-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/mfa-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/password-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/password-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/password-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/password-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/password-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/authn/saml-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/authn/saml-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/authn/saml-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/authn/saml-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/saml-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/spnego-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/spnego-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/spnego-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/spnego-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-internal-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-internal-authn-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-internal-authn-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-internal-authn-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/x509-internal-authn-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/simple-subject-c14n-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/simple-subject-c14n-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/simple-subject-c14n-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/simple-subject-c14n-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/simple-subject-c14n-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/simple-subject-c14n-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/simple-subject-c14n-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/simple-subject-c14n-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-abstract-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-abstract-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/x500-subject-c14n-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/x500-subject-c14n-beans.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/x500-subject-c14n-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/x500-subject-c14n-beans.xml
diff --git a/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/x500-subject-c14n-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/x500-subject-c14n-flow.xml
similarity index 100%
rename from idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/x500-subject-c14n-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/c14n/x500-subject-c14n-flow.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-flow.xml
similarity index 96%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-flow.xml
index 7e20aebed..2fe6644b5 100644
--- a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-flow.xml
@@ -58,5 +58,5 @@
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleError" />
     </global-transitions>
 
-    <bean-import resource="classpath:/net/shibboleth/idp/cas/flows/cas-abstract-beans.xml" />    
+    <bean-import resource="classpath:/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml" />    
 </flow>
\ No newline at end of file
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/login-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/login-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/login-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-flow.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/login-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-flow.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/logout/cas-logoutprop-flow.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/logout/cas-logoutprop-flow.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxy-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/proxy-beans.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxy-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/proxy-beans.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxy-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/proxy-flow.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxy-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/proxy-flow.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxyValidate-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/proxyValidate-beans.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxyValidate-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/proxyValidate-beans.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxyValidate-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/proxyValidate-flow.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxyValidate-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/proxyValidate-flow.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/samlValidate-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/samlValidate-beans.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/samlValidate-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/samlValidate-beans.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/samlValidate-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/samlValidate-flow.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/samlValidate-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/samlValidate-flow.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/serviceValidate-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/serviceValidate-beans.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/serviceValidate-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/serviceValidate-beans.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/serviceValidate-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/serviceValidate-flow.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/serviceValidate-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/serviceValidate-flow.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-abstract-beans.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-abstract-beans.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-abstract-flow.xml
similarity index 97%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-abstract-flow.xml
index 10b637964..4fb20160f 100644
--- a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-abstract-flow.xml
@@ -107,5 +107,5 @@
         </on-entry>
     </end-state>
 
-    <bean-import resource="classpath:/net/shibboleth/idp/cas/flows/validate-abstract-beans.xml" />
+    <bean-import resource="classpath:/net/shibboleth/idp/flows/cas/validate-abstract-beans.xml" />
 </flow>
\ No newline at end of file
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-beans.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-beans.xml
diff --git a/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-flow.xml
similarity index 100%
rename from idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/validate-flow.xml
diff --git a/idp-session-impl/src/main/resources/net/shibboleth/idp/session/flows/client-storage-read-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml
similarity index 100%
rename from idp-session-impl/src/main/resources/net/shibboleth/idp/session/flows/client-storage-read-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-beans.xml
diff --git a/idp-session-impl/src/main/resources/net/shibboleth/idp/session/flows/client-storage-read-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-flow.xml
similarity index 100%
rename from idp-session-impl/src/main/resources/net/shibboleth/idp/session/flows/client-storage-read-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-read-flow.xml
diff --git a/idp-session-impl/src/main/resources/net/shibboleth/idp/session/flows/client-storage-write-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml
similarity index 100%
rename from idp-session-impl/src/main/resources/net/shibboleth/idp/session/flows/client-storage-write-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-beans.xml
diff --git a/idp-session-impl/src/main/resources/net/shibboleth/idp/session/flows/client-storage-write-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-flow.xml
similarity index 100%
rename from idp-session-impl/src/main/resources/net/shibboleth/idp/session/flows/client-storage-write-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/client-storage/client-storage-write-flow.xml
diff --git a/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
similarity index 100%
rename from idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-beans.xml
diff --git a/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-flow.xml
similarity index 100%
rename from idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-flow.xml
diff --git a/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-query-beans.xml
similarity index 100%
rename from idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-query-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-query-beans.xml
diff --git a/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-query-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-query-flow.xml
similarity index 100%
rename from idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-query-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/attribute-release-query-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/context-check-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/context-check-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/context-check-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/context-check-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/context-check-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/context-check-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/context-check-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/context-check-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/expiring-password-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/expiring-password-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/expiring-password-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/expiring-password-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/expiring-password-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/expiring-password-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/expiring-password-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/expiring-password-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/external-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/external-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/external-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/external-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/impersonate-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/impersonate-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/impersonate-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/impersonate-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/impersonate-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-abstract-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-abstract-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/intercept-flow.xml
diff --git a/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/terms-of-use-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml
similarity index 100%
rename from idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/terms-of-use-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-beans.xml
diff --git a/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/terms-of-use-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-flow.xml
similarity index 100%
rename from idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/terms-of-use-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/terms-of-use-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/warning-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/warning-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/warning-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/warning-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/warning-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-propagation-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-propagation-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-propagation-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-propagation-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/logout/logout-propagation-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-flow.xml
similarity index 99%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-flow.xml
index 76f5874d0..4535aef22 100644
--- a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-flow.xml
@@ -193,6 +193,6 @@
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleError" />
     </global-transitions>
     
-    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/saml-abstract-beans.xml"/>
+    <bean-import resource="classpath:/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml"/>
 
 </flow>
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/attribute-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/attribute-query-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/attribute-query-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/attribute-query-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/common-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/common-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/common-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-abstract-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-abstract-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-abstract-flow.xml
similarity index 98%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-abstract-flow.xml
index c68c97ea7..6a4fc2b32 100644
--- a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-abstract-flow.xml
@@ -154,6 +154,6 @@
         </on-entry>
     </end-state>
 
-    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/saml1/sso-abstract-beans.xml" />
+    <bean-import resource="classpath:/net/shibboleth/idp/flows/saml/saml1/sso-abstract-beans.xml" />
 
 </flow>
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-security-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-security-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-security-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-security-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/attribute-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/attribute-query-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/attribute-query-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/attribute-query-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/common-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/common-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/common-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/ecp-security-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/ecp-security-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/ecp-security-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/ecp-security-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-security-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-security-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-security-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-security-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-artifact-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-artifact-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-artifact-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-artifact-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-artifact-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-artifact-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-artifact-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-artifact-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-back-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-back-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-back-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-back-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-back-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-flow.xml
similarity index 99%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-flow.xml
index 1d1eeca2a..9a290019b 100644
--- a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-flow.xml
@@ -262,6 +262,6 @@
         </on-entry>
     </end-state>
     
-    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-beans.xml" />
+    <bean-import resource="classpath:/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-beans.xml" />
 
 </flow>
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-simplesign-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-simplesign-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-simplesign-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-simplesign-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-simplesign-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-simplesign-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-simplesign-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-post-simplesign-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-redirect-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-redirect-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-redirect-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-redirect-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-redirect-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-redirect-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-redirect-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-redirect-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-security-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-security-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-security-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/slo-security-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-flow.xml
similarity index 98%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-flow.xml
index a88579c52..f321ab327 100644
--- a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-abstract-flow.xml
@@ -204,5 +204,5 @@
         </on-entry>
     </end-state>
 
-    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-abstract-beans.xml" />
+    <bean-import resource="classpath:/net/shibboleth/idp/flows/saml/saml2/sso-abstract-beans.xml" />
 </flow>
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-artifact-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-artifact-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-artifact-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-artifact-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-artifact-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-artifact-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-artifact-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-artifact-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-ecp-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-ecp-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-ecp-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-ecp-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-ecp-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-ecp-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-ecp-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-ecp-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-simplesign-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-simplesign-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-simplesign-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-simplesign-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-simplesign-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-simplesign-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-simplesign-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-post-simplesign-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-redirect-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-redirect-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-redirect-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-redirect-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-redirect-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-redirect-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-redirect-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-redirect-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-security-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-security-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-security-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-security-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-flow.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-abstract-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/security-abstract-flow.xml
similarity index 92%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-abstract-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/security-abstract-flow.xml
index 59eadd0a1..b5ada24a0 100644
--- a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-abstract-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/security-abstract-flow.xml
@@ -23,5 +23,5 @@
         <transition on="MessageAuthenticationError" to="MessageAuthenticationError" />
     </global-transitions>
 
-    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/security-beans.xml"/>
+    <bean-import resource="classpath:/net/shibboleth/idp/flows/saml/security-beans.xml"/>
 </flow>
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/security-beans.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-beans.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/security-beans.xml
diff --git a/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/soap-security-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/soap-security-flow.xml
similarity index 100%
rename from idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/soap-security-flow.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/soap-security-flow.xml
diff --git a/idp-conf/src/main/resources/system/views/mdquery.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/admin/mdquery.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/mdquery.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/admin/mdquery.vm
diff --git a/idp-conf/src/main/resources/system/views/resolvertest.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/admin/resolvertest.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/resolvertest.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/admin/resolvertest.vm
diff --git a/idp-conf/src/main/resources/system/views/client-storage/local-storage-read.js b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/client-storage/local-storage-read.js
similarity index 100%
rename from idp-conf/src/main/resources/system/views/client-storage/local-storage-read.js
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/client-storage/local-storage-read.js
diff --git a/idp-conf/src/main/resources/system/views/client-storage/local-storage-write.js b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/client-storage/local-storage-write.js
similarity index 100%
rename from idp-conf/src/main/resources/system/views/client-storage/local-storage-write.js
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/client-storage/local-storage-write.js
diff --git a/idp-conf/src/main/resources/system/views/client-storage/read.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/client-storage/read.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/client-storage/read.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/client-storage/read.vm
diff --git a/idp-conf/src/main/resources/system/views/client-storage/write.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/views/client-storage/write.vm
similarity index 100%
rename from idp-conf/src/main/resources/system/views/client-storage/write.vm
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/views/client-storage/write.vm
diff --git a/idp-conf-impl/src/test/java/.gitkeep b/idp-conf-impl/src/test/java/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/idp-conf-impl/src/test/resources/logback-test.xml b/idp-conf-impl/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..f3280e56b
--- /dev/null
+++ b/idp-conf-impl/src/test/resources/logback-test.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>%level [%logger:%line] - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <root>
+        <level value="warn" />
+        <appender-ref ref="STDOUT" />
+    </root>
+    
+</configuration>
\ No newline at end of file
diff --git a/idp-conf/pom.xml b/idp-conf/pom.xml
index 133c955b0..b264d64df 100644
--- a/idp-conf/pom.xml
+++ b/idp-conf/pom.xml
@@ -26,78 +26,6 @@
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->
-        <!-- These are declared for STS tooling support in Eclipse. Considering removal. -->
-        <!--
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-api</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-messaging-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-profile-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-admin-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-authn-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-cas-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-session-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-saml-api</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-saml-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-ui</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-consent-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        -->
 
         <!-- Test Dependencies -->
         <dependency>
@@ -156,6 +84,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-conf-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-consent-impl</artifactId>
@@ -195,19 +129,22 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-
-<!--        <dependency>
-            <groupId>net.shibboleth.utilities</groupId>
-            <artifactId>java-support</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>-->
         
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!-- We need these even if mvn dependency:analyze says we don't - loaded by service interface -->
         <dependency>
diff --git a/idp-conf/src/main/resources/system/conf/mvc-beans.xml b/idp-conf/src/main/resources/system/conf/mvc-beans.xml
index 20d5c71b8..ea9fe50ce 100644
--- a/idp-conf/src/main/resources/system/conf/mvc-beans.xml
+++ b/idp-conf/src/main/resources/system/conf/mvc-beans.xml
@@ -91,8 +91,10 @@
         <property name="contentType" value="text/html;charset=utf-8" />
     </bean>
 
+    <!-- Note that non-file paths are passed through to Spring's DefaultResourceLoader, thus can be targeted classpath trees. -->
     <bean class="net.shibboleth.ext.spring.velocity.VelocityConfigurer">
-        <property name="resourceLoaderPath" value="#{'%{idp.views:%{idp.home}/views}'.trim()},%{idp.home}/system/views" />
+        <property name="resourceLoaderPath"
+            value="#{'%{idp.views:%{idp.home}/views}'.trim()},%{idp.home}/system/views,classpath:/net/shibboleth/idp/views" />
     </bean>
     
     <!-- Import any user defined beans or overrides for the MVC config. -->
diff --git a/idp-conf/src/main/resources/system/conf/webflow-config.xml b/idp-conf/src/main/resources/system/conf/webflow-config.xml
index 2eee79800..733e86f46 100644
--- a/idp-conf/src/main/resources/system/conf/webflow-config.xml
+++ b/idp-conf/src/main/resources/system/conf/webflow-config.xml
@@ -17,145 +17,145 @@
         <property name="sourceMap">
             <map>
                 <!-- Abstract base flow for admin flows. -->
-                <entry key="admin.abstract" value="classpath:/net/shibboleth/idp/admin/flows/admin-abstract-flow.xml"/>
+                <entry key="admin.abstract" value="classpath:/net/shibboleth/idp/flows/admin/admin-abstract-flow.xml"/>
 
                 <!-- Status flow (extra location is for backward compatibility). -->
-                <entry key="status" value="classpath:/net/shibboleth/idp/admin/flows/status-flow.xml" />
+                <entry key="status" value="classpath:/net/shibboleth/idp/flows/admin/status-flow.xml" />
 
                 <!-- Administrative and debugging flows. -->
-                <entry key="admin/hello" value="classpath:/net/shibboleth/idp/admin/flows/hello-flow.xml" />
-                <entry key="admin/resolvertest" value="classpath:/net/shibboleth/idp/admin/flows/resolvertest-flow.xml" />
-                <entry key="admin/reload-service" value="classpath:/net/shibboleth/idp/admin/flows/reload-service-flow.xml" />
-                <entry key="admin/reload-metadata" value="classpath:/net/shibboleth/idp/admin/flows/reload-metadata-flow.xml" />
-                <entry key="admin/lockout" value="classpath:/net/shibboleth/idp/admin/flows/lockout-flow.xml" />
-                <entry key="admin/mdquery" value="classpath:/net/shibboleth/idp/admin/flows/mdquery-flow.xml" />
-                <entry key="admin/metrics" value="classpath:/net/shibboleth/idp/admin/flows/metrics-flow.xml" />
-                <entry key="admin/storage" value="classpath:/net/shibboleth/idp/admin/flows/storage-flow.xml" />
-                <entry key="admin/unlock-keys" value="classpath:/net/shibboleth/idp/admin/flows/unlock-keys-flow.xml" />
+                <entry key="admin/hello" value="classpath:/net/shibboleth/idp/flows/admin/hello-flow.xml" />
+                <entry key="admin/resolvertest" value="classpath:/net/shibboleth/idp/flows/admin/resolvertest-flow.xml" />
+                <entry key="admin/reload-service" value="classpath:/net/shibboleth/idp/flows/admin/reload-service-flow.xml" />
+                <entry key="admin/reload-metadata" value="classpath:/net/shibboleth/idp/flows/admin/reload-metadata-flow.xml" />
+                <entry key="admin/lockout" value="classpath:/net/shibboleth/idp/flows/admin/lockout-flow.xml" />
+                <entry key="admin/mdquery" value="classpath:/net/shibboleth/idp/flows/admin/mdquery-flow.xml" />
+                <entry key="admin/metrics" value="classpath:/net/shibboleth/idp/flows/admin/metrics-flow.xml" />
+                <entry key="admin/storage" value="classpath:/net/shibboleth/idp/flows/admin/storage-flow.xml" />
+                <entry key="admin/unlock-keys" value="classpath:/net/shibboleth/idp/flows/admin/unlock-keys-flow.xml" />
                         
                 <!-- Proprietary logout flow. -->
-                <entry key="Logout" value="classpath:/net/shibboleth/idp/profile/flows/logout/logout-flow.xml" />
+                <entry key="Logout" value="classpath:/net/shibboleth/idp/flows/logout/logout-flow.xml" />
         
                 <!-- Logout propagation driver flow. -->
-                <entry key="PropagateLogout" value="classpath:/net/shibboleth/idp/profile/flows/logout/logout-propagation-flow.xml" />
+                <entry key="PropagateLogout" value="classpath:/net/shibboleth/idp/flows/logout/logout-propagation-flow.xml" />
         
                 <!-- Logout propagation delegate flows. -->
-                <entry key="logoutprop/cas" value="classpath:/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml" />
-                <entry key="logoutprop/saml2" value="classpath:/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-flow.xml" />
+                <entry key="logoutprop/cas" value="classpath:/net/shibboleth/idp/flows/cas/logout/cas-logoutprop-flow.xml" />
+                <entry key="logoutprop/saml2" value="classpath:/net/shibboleth/idp/flows/saml/logout/saml2-logoutprop-flow.xml" />
         
                 <!-- Abstract flows underpinning SAML profiles. -->
-                <entry key="saml.abstract" value="classpath:/net/shibboleth/idp/saml/flows/saml-abstract-flow.xml" />
-                <entry key="saml1.sso.abstract" value="classpath:/net/shibboleth/idp/saml/flows/saml1/sso-abstract-flow.xml" />
-                <entry key="saml2.sso.abstract" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-abstract-flow.xml" />
-                <entry key="saml2.slo.front.abstract" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-flow.xml" />
+                <entry key="saml.abstract" value="classpath:/net/shibboleth/idp/flows/saml/saml-abstract-flow.xml" />
+                <entry key="saml1.sso.abstract" value="classpath:/net/shibboleth/idp/flows/saml/saml1/sso-abstract-flow.xml" />
+                <entry key="saml2.sso.abstract" value="classpath:/net/shibboleth/idp/flows/saml/saml2/sso-abstract-flow.xml" />
+                <entry key="saml2.slo.front.abstract" value="classpath:/net/shibboleth/idp/flows/saml/saml2/slo-front-abstract-flow.xml" />
         
                 <!-- SAML profile flows. -->
-                <entry key="Shibboleth/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-flow.xml" />
-                <entry key="SAML1/SOAP/AttributeQuery" value="classpath:/net/shibboleth/idp/saml/flows/saml1/attribute-query-flow.xml" />
-                <entry key="SAML1/SOAP/ArtifactResolution" value="classpath:/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-flow.xml" />
-                <entry key="SAML2/POST/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-post-flow.xml" />
-                <entry key="SAML2/POST-SimpleSign/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-post-flow.xml" />
-                <entry key="SAML2/Redirect/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-redirect-flow.xml" />
-                <entry key="SAML2/Artifact/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-artifact-flow.xml" />
-                <entry key="SAML2/Unsolicited/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-flow.xml" />
-                <entry key="SAML2/SOAP/ECP" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-ecp-flow.xml" />
-                <entry key="SAML2/POST/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-post-flow.xml" />
-                <entry key="SAML2/POST-SimpleSign/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-post-flow.xml" />
-                <entry key="SAML2/Redirect/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-redirect-flow.xml" />
-                <entry key="SAML2/Artifact/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-artifact-flow.xml" />
-                <entry key="SAML2/SOAP/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-back-flow.xml" />
-                <entry key="SAML2/SOAP/AttributeQuery" value="classpath:/net/shibboleth/idp/saml/flows/saml2/attribute-query-flow.xml" />
-                <entry key="SAML2/SOAP/ArtifactResolution" value="classpath:/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-flow.xml" />
+                <entry key="Shibboleth/SSO" value="classpath:/net/shibboleth/idp/flows/saml/saml1/sso-unsolicited-flow.xml" />
+                <entry key="SAML1/SOAP/AttributeQuery" value="classpath:/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml" />
+                <entry key="SAML1/SOAP/ArtifactResolution" value="classpath:/net/shibboleth/idp/flows/saml/saml1/artifact-resolution-flow.xml" />
+                <entry key="SAML2/POST/SSO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/sso-post-flow.xml" />
+                <entry key="SAML2/POST-SimpleSign/SSO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/sso-post-flow.xml" />
+                <entry key="SAML2/Redirect/SSO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/sso-redirect-flow.xml" />
+                <entry key="SAML2/Artifact/SSO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/sso-artifact-flow.xml" />
+                <entry key="SAML2/Unsolicited/SSO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/sso-unsolicited-flow.xml" />
+                <entry key="SAML2/SOAP/ECP" value="classpath:/net/shibboleth/idp/flows/saml/saml2/sso-ecp-flow.xml" />
+                <entry key="SAML2/POST/SLO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/slo-post-flow.xml" />
+                <entry key="SAML2/POST-SimpleSign/SLO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/slo-post-flow.xml" />
+                <entry key="SAML2/Redirect/SLO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/slo-redirect-flow.xml" />
+                <entry key="SAML2/Artifact/SLO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/slo-artifact-flow.xml" />
+                <entry key="SAML2/SOAP/SLO" value="classpath:/net/shibboleth/idp/flows/saml/saml2/slo-back-flow.xml" />
+                <entry key="SAML2/SOAP/AttributeQuery" value="classpath:/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml" />
+                <entry key="SAML2/SOAP/ArtifactResolution" value="classpath:/net/shibboleth/idp/flows/saml/saml2/artifact-resolution-flow.xml" />
                 
                 <!-- Liberty IDWSF SSOS flow (for SAML 2 delegation) -->
-                <entry key="IDWSF/SSOS" value="classpath:/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-flow.xml" />
+                <entry key="IDWSF/SSOS" value="classpath:/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-flow.xml" />
         
                 <!-- Main flow for authentication. -->
                 <entry key="authn.events" value="%{idp.home}/conf/authn/authn-events-flow.xml" />
-                <entry key="authn.abstract" value="classpath:/net/shibboleth/idp/authn/flows/authn-abstract-flow.xml" />
-                <entry key="authn" value="classpath:/net/shibboleth/idp/authn/flows/authn-flow.xml" />
+                <entry key="authn.abstract" value="classpath:/net/shibboleth/idp/flows/authn/authn-abstract-flow.xml" />
+                <entry key="authn" value="classpath:/net/shibboleth/idp/flows/authn/authn-flow.xml" />
         
                 <!-- Login methods. -->
-                <entry key="authn/IPAddress" value="classpath:/net/shibboleth/idp/authn/flows/ipaddress-authn-flow.xml" />
-                <entry key="authn/RemoteUserInternal" value="classpath:/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-flow.xml" />
-                <entry key="authn/Password" value="classpath:/net/shibboleth/idp/authn/flows/password-authn-flow.xml" />
-                <entry key="authn/RemoteUser" value="classpath:/net/shibboleth/idp/authn/flows/remoteuser-authn-flow.xml" />
-                <entry key="authn/X509" value="classpath:/net/shibboleth/idp/authn/flows/x509-authn-flow.xml" />
-                <entry key="authn/X509Internal" value="classpath:/net/shibboleth/idp/authn/flows/x509-internal-authn-flow.xml" />
-                <entry key="authn/SPNEGO" value="classpath:/net/shibboleth/idp/authn/flows/spnego-authn-flow.xml" />
-                <entry key="authn/External" value="classpath:/net/shibboleth/idp/authn/flows/external-authn-flow.xml" />
-                <entry key="authn/Duo" value="classpath:/net/shibboleth/idp/authn/flows/duo-authn-flow.xml" />
-                <entry key="authn/MFA" value="classpath:/net/shibboleth/idp/authn/flows/mfa-authn-flow.xml" />
-                <entry key="authn/Function" value="classpath:/net/shibboleth/idp/authn/flows/function-authn-flow.xml" />
-                <entry key="authn/SAML" value="classpath:/net/shibboleth/idp/saml/flows/authn/saml-authn-flow.xml" />
+                <entry key="authn/IPAddress" value="classpath:/net/shibboleth/idp/flows/authn/ipaddress-authn-flow.xml" />
+                <entry key="authn/RemoteUserInternal" value="classpath:/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-flow.xml" />
+                <entry key="authn/Password" value="classpath:/net/shibboleth/idp/flows/authn/password-authn-flow.xml" />
+                <entry key="authn/RemoteUser" value="classpath:/net/shibboleth/idp/flows/authn/remoteuser-authn-flow.xml" />
+                <entry key="authn/X509" value="classpath:/net/shibboleth/idp/flows/authn/x509-authn-flow.xml" />
+                <entry key="authn/X509Internal" value="classpath:/net/shibboleth/idp/flows/authn/x509-internal-authn-flow.xml" />
+                <entry key="authn/SPNEGO" value="classpath:/net/shibboleth/idp/flows/authn/spnego-authn-flow.xml" />
+                <entry key="authn/External" value="classpath:/net/shibboleth/idp/flows/authn/external-authn-flow.xml" />
+                <entry key="authn/Duo" value="classpath:/net/shibboleth/idp/flows/authn/duo-authn-flow.xml" />
+                <entry key="authn/MFA" value="classpath:/net/shibboleth/idp/flows/authn/mfa-authn-flow.xml" />
+                <entry key="authn/Function" value="classpath:/net/shibboleth/idp/flows/authn/function-authn-flow.xml" />
+                <entry key="authn/SAML" value="classpath:/net/shibboleth/idp/flows/authn/saml-authn-flow.xml" />
           
                 <!-- One-off flow for discovery. -->
-                <entry key="authn/Discovery" value="classpath:/net/shibboleth/idp/authn/flows/discovery-flow.xml" />
+                <entry key="authn/Discovery" value="classpath:/net/shibboleth/idp/flows/authn/discovery-flow.xml" />
           
                 <!-- Main flow for subject c14n. -->
                 <entry key="c14n.events" value="%{idp.home}/conf/c14n/subject-c14n-events-flow.xml" />
-                <entry key="c14n.abstract" value="classpath:/net/shibboleth/idp/c14n/flows/subject-c14n-abstract-flow.xml" />
-                <entry key="c14n" value="classpath:/net/shibboleth/idp/c14n/flows/subject-c14n-flow.xml" />
+                <entry key="c14n.abstract" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-abstract-flow.xml" />
+                <entry key="c14n" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-flow.xml" />
         
                 <!-- Standard post-login C14N methods. -->
-                <entry key="c14n/simple" value="classpath:/net/shibboleth/idp/c14n/flows/simple-subject-c14n-flow.xml" />
-                <entry key="c14n/x500" value="classpath:/net/shibboleth/idp/c14n/flows/x500-subject-c14n-flow.xml" />
-                <entry key="c14n/attribute" value="classpath:/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-flow.xml" />
+                <entry key="c14n/simple" value="classpath:/net/shibboleth/idp/flows/c14n/simple-subject-c14n-flow.xml" />
+                <entry key="c14n/x500" value="classpath:/net/shibboleth/idp/flows/c14n/x500-subject-c14n-flow.xml" />
+                <entry key="c14n/attribute" value="classpath:/net/shibboleth/idp/flows/c14n/attribute-sourced-subject-c14n-flow.xml" />
         
                 <!--
                 Standard SAML C14N methods, including one supporting legacy use of the attribute resolver.
                 These all map to the same flow, and they derive the bean ID of an action to run based on the
                 flow id after the slash.
                 -->
-                <entry key="c14n/SAML2Transient" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML2CryptoTransient" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML2Persistent" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML2Transform" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML2ProxyTransform" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML1Transient" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML1CryptoTransient" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML1Transform" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/LegacyPrincipalConnector" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML2Transient" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML2CryptoTransient" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML2Persistent" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML2Transform" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML2ProxyTransform" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML1Transient" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML1CryptoTransient" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML1Transform" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/LegacyPrincipalConnector" value="classpath:/net/shibboleth/idp/flows/c14n/subject-c14n-saml-default-flow.xml" />
         
                 <!-- Main interceptor flow. -->
                 <entry key="intercept.events" value="%{idp.home}/conf/intercept/intercept-events-flow.xml" />
-                <entry key="intercept.abstract" value="classpath:/net/shibboleth/idp/profile/flows/intercept/intercept-abstract-flow.xml" />
-                <entry key="intercept" value="classpath:/net/shibboleth/idp/profile/flows/intercept/intercept-flow.xml" />
+                <entry key="intercept.abstract" value="classpath:/net/shibboleth/idp/flows/intercept/intercept-abstract-flow.xml" />
+                <entry key="intercept" value="classpath:/net/shibboleth/idp/flows/intercept/intercept-flow.xml" />
         
                 <!-- Built-in interceptor flows. -->
-                <entry key="intercept/terms-of-use" value="classpath:/net/shibboleth/idp/consent/flows/terms-of-use-flow.xml" />
-                <entry key="intercept/attribute-release" value="classpath:/net/shibboleth/idp/consent/flows/attribute-release-flow.xml" />
-                <entry key="intercept/attribute-release-query" value="classpath:/net/shibboleth/idp/consent/flows/attribute-release-query-flow.xml" />
-                <entry key="intercept/context-check" value="classpath:/net/shibboleth/idp/profile/flows/intercept/context-check-flow.xml" />
-                <entry key="intercept/expiring-password" value="classpath:/net/shibboleth/idp/profile/flows/intercept/expiring-password-flow.xml" />
-                <entry key="intercept/impersonate" value="classpath:/net/shibboleth/idp/profile/flows/intercept/impersonate-flow.xml" />
-                <entry key="intercept/external" value="classpath:/net/shibboleth/idp/profile/flows/intercept/external-flow.xml" />
-                <entry key="intercept/warning" value="classpath:/net/shibboleth/idp/profile/flows/intercept/warning-flow.xml" />
+                <entry key="intercept/terms-of-use" value="classpath:/net/shibboleth/idp/flows/intercept/terms-of-use-flow.xml" />
+                <entry key="intercept/attribute-release" value="classpath:/net/shibboleth/idp/flows/intercept/attribute-release-flow.xml" />
+                <entry key="intercept/attribute-release-query" value="classpath:/net/shibboleth/idp/flows/intercept/attribute-release-query-flow.xml" />
+                <entry key="intercept/context-check" value="classpath:/net/shibboleth/idp/flows/intercept/context-check-flow.xml" />
+                <entry key="intercept/expiring-password" value="classpath:/net/shibboleth/idp/flows/intercept/expiring-password-flow.xml" />
+                <entry key="intercept/impersonate" value="classpath:/net/shibboleth/idp/flows/intercept/impersonate-flow.xml" />
+                <entry key="intercept/external" value="classpath:/net/shibboleth/idp/flows/intercept/external-flow.xml" />
+                <entry key="intercept/warning" value="classpath:/net/shibboleth/idp/flows/intercept/warning-flow.xml" />
         
                 <!-- Inbound security processing of SAML messages, implemented as intercept flows. -->
-                <entry key="security-policy.abstract" value="classpath:/net/shibboleth/idp/saml/flows/security-abstract-flow.xml" />
-                <entry key="intercept/security-policy/shibboleth-sso" value="classpath:/net/shibboleth/idp/saml/flows/saml1/sso-security-flow.xml" />
-                <entry key="intercept/security-policy/saml2-sso" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-security-flow.xml" />
-                <entry key="intercept/security-policy/saml2-ecp" value="classpath:/net/shibboleth/idp/saml/flows/saml2/ecp-security-flow.xml" />
-                <entry key="intercept/security-policy/saml2-slo" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-security-flow.xml" />
-                <entry key="intercept/security-policy/saml2-idwsf-ssos" value="classpath:/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-flow.xml" />
-                <entry key="intercept/security-policy/saml-soap" value="classpath:/net/shibboleth/idp/saml/flows/soap-security-flow.xml" />
+                <entry key="security-policy.abstract" value="classpath:/net/shibboleth/idp/flows/saml/security-abstract-flow.xml" />
+                <entry key="intercept/security-policy/shibboleth-sso" value="classpath:/net/shibboleth/idp/flows/saml/saml1/sso-security-flow.xml" />
+                <entry key="intercept/security-policy/saml2-sso" value="classpath:/net/shibboleth/idp/flows/saml/saml2/sso-security-flow.xml" />
+                <entry key="intercept/security-policy/saml2-ecp" value="classpath:/net/shibboleth/idp/flows/saml/saml2/ecp-security-flow.xml" />
+                <entry key="intercept/security-policy/saml2-slo" value="classpath:/net/shibboleth/idp/flows/saml/saml2/slo-security-flow.xml" />
+                <entry key="intercept/security-policy/saml2-idwsf-ssos" value="classpath:/net/shibboleth/idp/flows/saml/saml2/idwsf-ssos-security-flow.xml" />
+                <entry key="intercept/security-policy/saml-soap" value="classpath:/net/shibboleth/idp/flows/saml/soap-security-flow.xml" />
         
                 <!-- CAS protocol flows. -->
-                <entry key="cas.abstract" value="classpath:/net/shibboleth/idp/cas/flows/cas-abstract-flow.xml" />
-                <entry key="cas.abstractValidate" value="classpath:/net/shibboleth/idp/cas/flows/validate-abstract-flow.xml" />
-                <entry key="cas/login" value="classpath:/net/shibboleth/idp/cas/flows/login-flow.xml" />
-                <entry key="cas/proxy" value="classpath:/net/shibboleth/idp/cas/flows/proxy-flow.xml" />
-                <entry key="cas/serviceValidate" value="classpath:/net/shibboleth/idp/cas/flows/serviceValidate-flow.xml" />
-                <entry key="cas/proxyValidate" value="classpath:/net/shibboleth/idp/cas/flows/proxyValidate-flow.xml" />
-                <entry key="cas/samlValidate" value="classpath:/net/shibboleth/idp/cas/flows/samlValidate-flow.xml" />
-                <entry key="cas/validate" value="classpath:/net/shibboleth/idp/cas/flows/validate-flow.xml" />
+                <entry key="cas.abstract" value="classpath:/net/shibboleth/idp/flows/cas/cas-abstract-flow.xml" />
+                <entry key="cas.abstractValidate" value="classpath:/net/shibboleth/idp/flows/cas/validate-abstract-flow.xml" />
+                <entry key="cas/login" value="classpath:/net/shibboleth/idp/flows/cas/login-flow.xml" />
+                <entry key="cas/proxy" value="classpath:/net/shibboleth/idp/flows/cas/proxy-flow.xml" />
+                <entry key="cas/serviceValidate" value="classpath:/net/shibboleth/idp/flows/cas/serviceValidate-flow.xml" />
+                <entry key="cas/proxyValidate" value="classpath:/net/shibboleth/idp/flows/cas/proxyValidate-flow.xml" />
+                <entry key="cas/samlValidate" value="classpath:/net/shibboleth/idp/flows/cas/samlValidate-flow.xml" />
+                <entry key="cas/validate" value="classpath:/net/shibboleth/idp/flows/cas/validate-flow.xml" />
                 <!-- Dual mount of logout flow to CAS location. -->
-                <entry key="cas/logout" value="classpath:/net/shibboleth/idp/profile/flows/logout/logout-flow.xml" />
+                <entry key="cas/logout" value="classpath:/net/shibboleth/idp/flows/logout/logout-flow.xml" />
         
                 <!-- Client storage flows. -->
-                <entry key="client-storage/read" value="classpath:/net/shibboleth/idp/session/flows/client-storage-read-flow.xml" />
-                <entry key="client-storage/write" value="classpath:/net/shibboleth/idp/session/flows/client-storage-write-flow.xml" />
+                <entry key="client-storage/read" value="classpath:/net/shibboleth/idp/flows/client-storage/client-storage-read-flow.xml" />
+                <entry key="client-storage/write" value="classpath:/net/shibboleth/idp/flows/client-storage/client-storage-write-flow.xml" />
             </map>
         </property>
     </bean>
diff --git a/idp-parent/pom.xml b/idp-parent/pom.xml
index b45cb6028..023fc8454 100644
--- a/idp-parent/pom.xml
+++ b/idp-parent/pom.xml
@@ -44,19 +44,20 @@
         <module>../idp-attribute-resolver-impl</module>
         <module>../idp-attribute-filter-impl</module>
         <module>../idp-cas-impl</module>
+        <module>../idp-consent-impl</module>
         <module>../idp-profile-impl</module>
-        <module>../idp-profile-spring</module>
         <module>../idp-saml-impl</module>
         <module>../idp-session-impl</module>
 
         <module>../idp-attribute-resolver-spring</module>
         <module>../idp-attribute-filter-spring</module>
+        <module>../idp-profile-spring</module>
 
-        <module>../idp-consent-impl</module>
         <module>../idp-war</module>
         <module>../idp-war-distribution</module>
         <module>../idp-installer</module>
         <module>../idp-conf</module>
+        <module>../idp-conf-impl</module>
         <module>../idp-distribution</module>
 
         <module>../idp-ui</module>
diff --git a/idp-profile-impl/pom.xml b/idp-profile-impl/pom.xml
index 444ae18a1..6fd2f6834 100644
--- a/idp-profile-impl/pom.xml
+++ b/idp-profile-impl/pom.xml
@@ -113,19 +113,6 @@
         </dependency>
 
         <!-- Runtime Dependencies -->
-        <!-- Supports Eclipse class lookup from within flow files. -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-session-impl</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-ui</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
diff --git a/idp-war/pom.xml b/idp-war/pom.xml
index 1f2f34ba6..737bbed71 100644
--- a/idp-war/pom.xml
+++ b/idp-war/pom.xml
@@ -74,6 +74,11 @@
             <artifactId>idp-authn-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-conf-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-consent-api</artifactId>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.