Updated docs and doc locations, general cleanup