(re-)organized source base to include other projects.