More fixes: semi-loads now
More fixes
Move PD parts one level up (reverted from commit e3b17a79eeb3ad27fda3abaf081b72105c462d34)