Fix builder method signatures
Rename
Change AssemblyInfo
Delete an unused file