fixing the function names, imports, and main methods
missing files and some class name changes