Files organized right, made sure r commands worked