[JDF-300] - Refactoring packages.