Consolidate models

Merge all of different models into master, and have model + training scripts follow the same format so that it's seamless to change between the different architectures.