Revert "Moving Everything Up"

This reverts commit 4692855ed8fc635c00962d287eb823abb58cadc8.