Document
Improve directory structure