Cleaned up inter-file references from re-organizing folder structure
Revert "Cleaned up inter-file references from re-organizing folder structure"

This reverts commit 900e6f045a8230a6a28c5c84ff38c0e78795b43e.
cleaned up inter-file dependencies.