Update to avoid overlapped function toString and add a folder for submission