Revert "Refactored the Entity List in preparation for child entity implementation"

This reverts commit 973c72cf013b4dd1212873be1dedca905d070bab.