Rename, deleted old stuff, moved between Network and Trainer.