Broke Types out into separate module