Rename packages and imports (1/2)
Moving refactored files to proper directory (2/2)
update references in build.xml