diff --git a/Makefile b/Makefile
index 8bab022..527d333 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,16 @@
 ONOS_APPS        ?= $(CORD)/onos-apps
 
 # Configuration paths
-PODCONFIG_D      ?= $(BUILD)/podconfig
+USECASE          := $(shell echo $(PODCONFIG) | awk -F '-' '{ print $$1}')
+PROFILE_D        ?= $(CORD)/orchestration/profiles/$(USECASE)
+
+PODCONFIG_D      ?= $(PROFILE_D)/podconfig
 PODCONFIG_PATH   ?= $(PODCONFIG_D)/$(PODCONFIG)
 
 SCENARIOS_D      ?= $(BUILD)/scenarios
 GENCONFIG_D      ?= $(BUILD)/genconfig
 
+
 CONFIG_CORD_PROFILE_DIR ?= $(CORD)/../cord_profile
 
 # Milestones/logs paths
@@ -93,7 +97,7 @@
 
 $(CONFIG_FILES):
 	test -e "$(PODCONFIG_PATH)" || { echo "PODCONFIG file $(PODCONFIG_PATH) doesn't exist!" ; exit 1; }
-	ansible-playbook -i 'localhost,' --extra-vars="cord_podconfig='$(PODCONFIG_PATH)' genconfig_dir='$(GENCONFIG_D)' scenarios_dir='$(SCENARIOS_D)' platform_install_dir='$(PI)'" $(BUILD)/ansible/genconfig.yml $(LOGCMD)
+	ansible-playbook -i 'localhost,' --extra-vars="cord_podconfig='$(PODCONFIG_PATH)' genconfig_dir='$(GENCONFIG_D)' scenarios_dir='$(SCENARIOS_D)' platform_install_dir='$(PI)' cord_profile_src_dir='$(PROFILE_D)' " $(BUILD)/ansible/genconfig.yml $(LOGCMD)
 
 printconfig:
 	@echo "Scenario: '$(SCENARIO)'"
diff --git a/ansible/genconfig.yml b/ansible/genconfig.yml
index 33f8202..9240a5d 100644
--- a/ansible/genconfig.yml
+++ b/ansible/genconfig.yml
@@ -41,7 +41,7 @@
 
     - name: Set profile_manifest_path fact
       set_fact:
-        profile_manifest_path:  "{{ (platform_install_dir ~ '/profile_manifests/' ~ cord_profile ~ '.yml') | realpath }}"
+        profile_manifest_path:  "{{ (cord_profile_src_dir ~ '/' ~ cord_profile ~ '.yml') | realpath }}"
 
     - name: Check for profile manifest
       stat:
diff --git a/podconfig/ecord-global-local.yml b/podconfig/ecord-global-local.yml
deleted file mode 100644
index f33f70b..0000000
--- a/podconfig/ecord-global-local.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ecord-global-local POD Config
-# Starts a E-CORD Global container set in the local environment
-
-cord_scenario: local
-cord_profile: ecord-global
-
diff --git a/podconfig/ecord-global-mock.yml b/podconfig/ecord-global-mock.yml
deleted file mode 100644
index 6594ed9..0000000
--- a/podconfig/ecord-global-mock.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ecord-global-mock Pod Config
-# Creates a single-node mock Global E-CORD pod
-
-cord_scenario: mock
-cord_profile: ecord-global
diff --git a/podconfig/ecord-global-single.yml b/podconfig/ecord-global-single.yml
deleted file mode 100644
index c97aa70..0000000
--- a/podconfig/ecord-global-single.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ecord-global-single Pod Config
-# Creates a single-node Global E-CORD pod w/synchronizers and ONOS
-# This is the production config for Global E-CORD development
-
-cord_scenario: single
-cord_profile: ecord-global
-
-start_xos_prereqs:
-  - deploy-onos
-
diff --git a/podconfig/ecord-local.yml b/podconfig/ecord-local.yml
deleted file mode 100644
index b25c9f6..0000000
--- a/podconfig/ecord-local.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ecord-local POD Config
-# Starts a E-CORD container set in the local environment
-
-cord_scenario: local
-cord_profile: ecord
-
diff --git a/podconfig/ecord-mock.yml b/podconfig/ecord-mock.yml
deleted file mode 100644
index 9656c06..0000000
--- a/podconfig/ecord-mock.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mock-ecord Pod Config
-# Creates a single-node mock E-CORD pod
-
-cord_scenario: mock
-cord_profile: ecord
-
diff --git a/podconfig/ecord-single.yml b/podconfig/ecord-single.yml
deleted file mode 100644
index 3cf79ec..0000000
--- a/podconfig/ecord-single.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ecord-single Pod Config
-# Creates a single-node mock E-CORD pod w/synchronizers
-
-cord_scenario: single
-cord_profile: ecord
-
-
diff --git a/podconfig/ecord-virtual.yml b/podconfig/ecord-virtual.yml
deleted file mode 100644
index ecf5b2e..0000000
--- a/podconfig/ecord-virtual.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ecord-virtual Pod Config
-# Creates a virtual multi-node E-CORD pod
-
-cord_scenario: cord
-cord_profile: ecord
-
-vagrant_up_prereqs:
-  - prereqs-check
-  - ciab-ovs
-
-build_targets:
- - compute1-up
-
-external_iface: 'eth0'
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
-
-skipTags:
-  - 'set_compute_node_password'
-  - 'switch_support'
-  - 'reboot'
-  - 'interface_config'
-
diff --git a/podconfig/mcord-cavium-local.yml b/podconfig/mcord-cavium-local.yml
deleted file mode 100644
index 22e24bd..0000000
--- a/podconfig/mcord-cavium-local.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# local-mcord Pod Config
-# Starts a M-CORD container set in the local environment
-
-cord_scenario: local
-cord_profile: mcord-cavium
-
diff --git a/podconfig/mcord-cavium-mock.yml b/podconfig/mcord-cavium-mock.yml
deleted file mode 100644
index 51f168d..0000000
--- a/podconfig/mcord-cavium-mock.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mock-mcord Pod Config
-# Creates a single-node mock M-CORD pod
-
-cord_scenario: mock
-cord_profile: mcord-cavium
-
diff --git a/podconfig/mcord-cavium-single.yml b/podconfig/mcord-cavium-single.yml
deleted file mode 100644
index 0ccf9ff..0000000
--- a/podconfig/mcord-cavium-single.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mcord-single Pod Config
-# Creates a single-node mock M-CORD pod w/synchronizers
-
-cord_scenario: single
-cord_profile: mcord-cavium
-
diff --git a/podconfig/mcord-cavium-virtual.yml b/podconfig/mcord-cavium-virtual.yml
deleted file mode 100644
index bc00c31..0000000
--- a/podconfig/mcord-cavium-virtual.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mcord-virtual Pod Config
-# Creates a virtual multi-node M-CORD pod, aka "mcord-in-a-box"
-
-cord_scenario: cord
-cord_profile: mcord-cavium
-
-compute_vm_mem: 32768
-
-vagrant_up_prereqs:
-  - prereqs-check
-  - ciab-ovs
-
-build_targets:
- - compute1-up
-
-external_iface: 'eth0'
-
-skipTags:
-  - 'set_compute_node_password'
-  - 'switch_support'
-  - 'reboot'
-  - 'interface_config'
-
-# Other old config carried over
-cord_in_a_box: True # what is this for?
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
diff --git a/podconfig/mcord-local.yml b/podconfig/mcord-local.yml
deleted file mode 100644
index 4c58209..0000000
--- a/podconfig/mcord-local.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# local-mcord Pod Config
-# Starts a M-CORD container set in the local environment
-
-cord_scenario: local
-cord_profile: mcord
-
diff --git a/podconfig/mcord-mock.yml b/podconfig/mcord-mock.yml
deleted file mode 100644
index d2bfb1a..0000000
--- a/podconfig/mcord-mock.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mock-mcord Pod Config
-# Creates a single-node mock M-CORD pod
-
-cord_scenario: mock
-cord_profile: mcord
-
diff --git a/podconfig/mcord-ng40-local.yml b/podconfig/mcord-ng40-local.yml
deleted file mode 100644
index 7ace9d5..0000000
--- a/podconfig/mcord-ng40-local.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# local-rcord Pod Config
-# Starts a R-CORD container set in the local environment
-
-cord_scenario: local
-cord_profile: mcord-ng40
-
diff --git a/podconfig/mcord-ng40-mock.yml b/podconfig/mcord-ng40-mock.yml
deleted file mode 100644
index ebe8bf0..0000000
--- a/podconfig/mcord-ng40-mock.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mock-mcord Pod Config
-# Creates a single-node mock M-CORD pod
-
-cord_scenario: mock
-cord_profile: mcord-ng40
-
diff --git a/podconfig/mcord-ng40-single.yml b/podconfig/mcord-ng40-single.yml
deleted file mode 100644
index cec8727..0000000
--- a/podconfig/mcord-ng40-single.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mcord-single Pod Config
-# Creates a single-node mock M-CORD pod w/synchronizers
-
-cord_scenario: single
-cord_profile: mcord-ng40
-
diff --git a/podconfig/mcord-ng40-virtual.yml b/podconfig/mcord-ng40-virtual.yml
deleted file mode 100644
index 20b02c3..0000000
--- a/podconfig/mcord-ng40-virtual.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mcord-virtual Pod Config
-# Creates a virtual multi-node M-CORD pod, aka "mcord-in-a-box"
-
-cord_scenario: cord
-cord_profile: mcord-ng40
-
-compute_vm_mem: 32768
-
-vagrant_up_prereqs:
-  - prereqs-check
-  - ciab-ovs
-
-build_targets:
- - compute1-up
-
-external_iface: 'eth0'
-
-skipTags:
-  - 'set_compute_node_password'
-  - 'switch_support'
-  - 'reboot'
-  - 'interface_config'
-
-# Other old config carried over
-cord_in_a_box: True # what is this for?
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
diff --git a/podconfig/mcord-single.yml b/podconfig/mcord-single.yml
deleted file mode 100644
index bc59124..0000000
--- a/podconfig/mcord-single.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# mcord-single Pod Config
-# Creates a single-node mock M-CORD pod w/synchronizers
-
-cord_scenario: single
-cord_profile: mcord
-
diff --git a/podconfig/mcord-spirent-mock.yml b/podconfig/mcord-spirent-mock.yml
deleted file mode 100644
index a664334..0000000
--- a/podconfig/mcord-spirent-mock.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mock-mcord Pod Config
-# Creates a single-node mock M-CORD pod
-
-cord_scenario: mock
-cord_profile: mcord-spirent
-
diff --git a/podconfig/mcord-spirent-single.yml b/podconfig/mcord-spirent-single.yml
deleted file mode 100644
index 91271c6..0000000
--- a/podconfig/mcord-spirent-single.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mcord-single Pod Config
-# Creates a single-node mock M-CORD pod w/synchronizers
-
-cord_scenario: single
-cord_profile: mcord-spirent
-
diff --git a/podconfig/mcord-spirent-virtual.yml b/podconfig/mcord-spirent-virtual.yml
deleted file mode 100644
index 57835c0..0000000
--- a/podconfig/mcord-spirent-virtual.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mcord-virtual Pod Config
-# Creates a virtual multi-node M-CORD pod, aka "mcord-in-a-box"
-
-cord_scenario: cord
-cord_profile: mcord-spirent
-
-vagrant_up_prereqs:
-  - prereqs-check
-  - ciab-ovs
-
-build_targets:
- - compute1-up
-
-external_iface: 'eth0'
-
-skipTags:
-  - 'set_compute_node_password'
-  - 'switch_support'
-  - 'reboot'
-  - 'interface_config'
-
-# Other old config carried over
-cord_in_a_box: True # what is this for?
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
diff --git a/podconfig/mcord-virtual.yml b/podconfig/mcord-virtual.yml
deleted file mode 100644
index 7424c2e..0000000
--- a/podconfig/mcord-virtual.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mcord-virtual Pod Config
-# Creates a virtual multi-node M-CORD pod, aka "mcord-in-a-box"
-
-cord_scenario: cord
-cord_profile: mcord
-
-vagrant_up_prereqs:
-  - prereqs-check
-  - ciab-ovs
-
-build_targets:
- - compute1-up
-
-external_iface: 'eth0'
-
-skipTags:
-  - 'set_compute_node_password'
-  - 'switch_support'
-  - 'reboot'
-  - 'interface_config'
-
-# Other old config carried over
-cord_in_a_box: True # what is this for?
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
diff --git a/podconfig/opencloud-local.yml b/podconfig/opencloud-local.yml
deleted file mode 100644
index ae9c826..0000000
--- a/podconfig/opencloud-local.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# local-opencloud Pod Config
-# Starts a OpenCloud container set in the local environment
-
-cord_scenario: local
-cord_profile: opencloud
-
diff --git a/podconfig/opencloud-mock.yml b/podconfig/opencloud-mock.yml
deleted file mode 100644
index 37f27b2..0000000
--- a/podconfig/opencloud-mock.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# mock-opencloud Pod Config
-# Creates a single-node mock OpenCloud pod
-
-cord_scenario: mock
-cord_profile: opencloud
-
diff --git a/podconfig/opencloud-physical-example.yml b/podconfig/opencloud-physical-example.yml
deleted file mode 100644
index 76ffe3e..0000000
--- a/podconfig/opencloud-physical-example.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# opencloud-physical Example Pod Config
-# Example Pod Config for a physical multi-node OpenCloud pod
-
-cord_scenario: opencloud
-cord_profile: opencloud
-
-config_cord_dir: /opt/cord
-config_cord_profile_dir: /opt/sites/az_site
-
-# No VM's, or prereqs
-vagrant_vms:
-vagrant_up_prereqs:
-
-buildnode: node01.opencloud.cs.arizona.edu
-headnode: "{{ buildnode }}"
-
-site_name: az
-site_suffix: "opencloud.cs.arizona.edu"
-site_humanname: "Arizona OpenCloud Site"
-
-mgmt_ipv4_first_octets: "10.10.40"
-
-physical_node_list:
-  - name: node01
-    ipv4_last_octet: 1
-    aliases:
-      - head
-      - head1
-  - name: node02
-    ipv4_last_octet: 2
-  - name: node03
-    ipv4_last_octet: 3
-  - name: node04
-    ipv4_last_octet: 4
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-
-  config:
-    localhost:
-      ansible_connection: local
-
-  build:
-    node01.opencloud.cs.arizona.edu:
-
-  head:
-    node01.opencloud.cs.arizona.edu:
-
-  compute:
-    node02.opencloud.cs.arizona.edu:
-    node03.opencloud.cs.arizona.edu:
-    node04.opencloud.cs.arizona.edu:
diff --git a/podconfig/opencloud-single.yml b/podconfig/opencloud-single.yml
deleted file mode 100644
index 2b82987..0000000
--- a/podconfig/opencloud-single.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# opencloud-single Pod Config
-# Creates a single-node OpenCloud pod w/synchronizers
-
-cord_scenario: single
-cord_profile: opencloud
-
diff --git a/podconfig/opencloud-virtual.yml b/podconfig/opencloud-virtual.yml
deleted file mode 100644
index e12ac17..0000000
--- a/podconfig/opencloud-virtual.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# opencloud-virtual Pod Config
-# Creates a virtual multi-node OpenCloud pod
-
-cord_scenario: opencloud
-cord_profile: opencloud
-
diff --git a/podconfig/physical-example.yml b/podconfig/physical-example.yml
index 2ff1283..06827e4 100644
--- a/podconfig/physical-example.yml
+++ b/podconfig/physical-example.yml
@@ -20,9 +20,10 @@
 # `cord` is the standard CORD POD with XOS, ONOS, MaaS and OpenStack
 cord_scenario: cord
 
-# The name of the profile to use, found in the
-# platform-install/profile_manifests directory
-# Example values: `rcord`, `ecord`, `mcord`, `opencloud`
+# The name of the profile to use.  A use case (e.g., M-CORD) can have
+# multiple profiles.  Here, specify the name of the profile file without
+# the .yml extension.
+# Example values: `rcord`, `ecord`, `mcord-cavium`, `opencloud`
 cord_profile: <must_be_set>
 
 # Bring up the corddev VM. This is the `build` node as specified in ansible
diff --git a/podconfig/rcord-controlpod.yml b/podconfig/rcord-controlpod.yml
deleted file mode 100644
index a910f83..0000000
--- a/podconfig/rcord-controlpod.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# rcord-controlpod Pod Config
-# Creates a single-node controlpod with R-CORD services
-
-cord_scenario: controlpod
-cord_profile: rcord
-
diff --git a/podconfig/rcord-local.yml b/podconfig/rcord-local.yml
deleted file mode 100644
index a3df1a6..0000000
--- a/podconfig/rcord-local.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# local-rcord Pod Config
-# Starts a R-CORD container set in the local environment
-
-cord_scenario: local
-cord_profile: rcord
-
diff --git a/podconfig/rcord-mock.yml b/podconfig/rcord-mock.yml
deleted file mode 100644
index f1b38e6..0000000
--- a/podconfig/rcord-mock.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# rcord-mock Pod Config
-# Creates a single-node mock R-CORD pod
-
-cord_scenario: mock
-cord_profile: rcord
-
diff --git a/podconfig/rcord-single.yml b/podconfig/rcord-single.yml
deleted file mode 100644
index 7efb1da..0000000
--- a/podconfig/rcord-single.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# rcord-single Pod Config
-# Creates a single-node mock R-CORD pod w/synchronizers
-
-cord_scenario: single
-cord_profile: rcord
-
diff --git a/podconfig/rcord-virtual.yml b/podconfig/rcord-virtual.yml
deleted file mode 100644
index bf826f0..0000000
--- a/podconfig/rcord-virtual.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# rcord-virtual Pod Config
-# Creates a virtual multi-node R-CORD pod, aka "rcord-in-a-box"
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_up_prereqs:
-  - prereqs-check
-  - ciab-ovs
-
-build_targets:
- - compute1-up
-
-external_iface: 'eth0'
-
-skipTags:
-  - 'set_compute_node_password'
-  - 'switch_support'
-  - 'reboot'
-  - 'interface_config'
-
-# Other old config carried over
-cord_in_a_box: True # what is this for?
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
\ No newline at end of file
diff --git a/scenarios/mock/config.yml b/scenarios/mock/config.yml
index a150a43..1574390 100644
--- a/scenarios/mock/config.yml
+++ b/scenarios/mock/config.yml
@@ -23,8 +23,8 @@
 build_cord_dir: /opt/cord
 
 # Vagrant VM configuration
-head_vm_mem: 6048
-head_vm_cpu: 4
+head_vm_mem: 2048
+head_vm_cpu: 1
 head_vm_ip: "192.168.46.100"
 
 physical_node_list: