organization of OATF repo format
merge .new instead of .src (duh)