Code clean-up, renamings, added project plan summary.