Refactored java classes to use com.company.project.* structure.