Regorganise hierarchy (prepare for marketplace package)