Refactoring. More consistent naming of projects and packages.