Move from standalone container to separate web and data containers

[codinghorror (Jeff Atwood)]

Thanks for getting it started, we will take it from here!