Update documentation and dir structure