Restructured how classes and packages will be organized.