Reorganized the scripts according to the new class structure