Splitting Message and Type packages into their own files