reorganized core packages