Reorganized source files, completed shift to the new name