Further removed unused classes and renamed some packages