Fix up project file, assembly name/namespaces
Fix file paths