Reorg source for cloud9 development.
More source code changes for cloud9 development.