Move datatypes to separate file