delete unused classes, rearranged packages, some refactorings