Reorganized indep dev before research