Refactor files: moved contents of mvc/ to app/