Add docs and merge files