Refactored Project for organisation.

New names for package and project.