Renaming project, do lists, misc minor fixes & refactoring