Moved model code into the application folder