Moved all files out of Model directory