Reorganize for more self-direction in labs