classes sorted to packages; applied some idea inspector suggestions