Improve documentation and directory structure