Refactored Utils and Data into the same Common project.