Rename project. Fix a few issues introduced in last round of rearrangement