Separates the interfaces from most remaining classes, cleanup