added source refs and renamed non modules to targets