Moved types to new files. preparing for refactor