Reorganized sources in different sub-projects