Package names has been updated and constants have been moved to new class.