Extract classes contained in The base model class file

Extract many classes contained in the base model class file and place
them in separate files