Revert "Reorganized a few things"

This reverts commit 6c603feed1bc7b444a6a5e46d2cc072a70ce82f0.