Changing files to match Wrapper conventions for train model & controller