Move stuff around to reduce bloating of root namespace