moved core classes to new package