Fixed more references to reference new src/ folder