Moved all types in their own files. #14