Reorganizing and adding documentation