Package reorganisation

Fix sync