made some source path modifications