Rebuilt project to fix some namespace issues