Restructure according to new guidelines.