Rename project, refactoring to use object oriented design