Changing package names to meet checkstyle