Move a few things around to make more logical structure