Began to restructure project for multiple sources