Reorganize for updated build script, fix ToString()
version 0.2.0