Refactor - Moved the different type files to a package.