renamed class and reordered files