Reorganization

Documentation and code reorganization