reorg folder to fit remote package pattern