refactoring, remove package cycles with inlined constants