Revert "Consolidating Files"

This reverts commit 523b90957bed429525265be9268d1ca96faf9feb.