Re-org to make compatible with git submoduling.