Doc re-organization

This address #151