Restructured almost everything