More reorg and pull more documentation from blackboard