renaming codrspace and removing a bunch of cruft