Moved views and models into own files