removed file fodlers and changed some class pathes