Changed package, put classes into right packages