Refactored project to reflect new name and object structure.