made some orginizational changes