Rename classes && make it auto loaded