Reorganize and Add docs