Revert "alchemy: change file structure to modules for views and models"

[tseaver]

Reverts #2022

Pending Travis fixes and discussion.

[ergo]

It is failing not because my changes but because whole branch is behind master in general and httpexceptions tests fail.

The actual functionality and changes were discussed on #pyramid, I could use some help in regards of actually making the branch up to date with current master, as my git foo is really weak.

[tseaver]

@ergo you can try:

$ git remote add upstream [email protected]:Pylons/pyramid.git
$ git fetch upstream
$ git checkout master
$ git merge upstream/master
$ git checkout alchemy-scaffold-update
$ git rebase master
$ git push -f origin alchemy-scaffold-update

Then create a new PR for your branch, and fix anything that fails on Travis before we merge it.

[mmerickel]

@tseaver Sorry but he shouldn't be rebasing other people's commits on top of master. He was issuing a PR against a WIP branch that hadn't been updated in a while.

I went ahead and merged master into that branch and issued PR #2024 with it. @ergo can rebase his personal changes against that branch and issue PRs to feature/alchemy-scaffold-update to have them included in the final WIP branch.