Moved to a multi-project scheme to deal with the shell project.