Project cleanup and package name realignment