Flattened packages, refactored all LoD violations