Move items for a correct package structure