moved packages to main directory