seperate source folders
modified Oewc