[JDF-295] - Refactoring packages.