Moved Type enum to new file