Restructures and renamed