More restructuring

Moving things around that make more sense to belong in certain methods