Moved files around + multi-pack stacking compatibility