restructuring og Origin Class into it's own header files