Revert "Beginning To Reorganize"

This reverts commit b515c5444052911490ce614ddbe8d6320799e290.