Reorganize and work on documentation