documentation; reorganization