Refactor datatypes into own file