Modify to seperate into src and obj