Task #940: Move licenses to appropriate place in docs. Additional cleanup.