Moved the files to the proper location. Added missing toString() extension for the String type.