Restructure and docs