moving packages in order to follow scalable naming scheme