[JDF-296] - Refactoring packages.