moved my classes into core package