Move Integer definition to separate file