moved model to appropriate file....