Reorganize classes, remove unneeded methods and classes