moved some classes to other packages
formated everything