Refactored the common includes

External recipes that should be used are:

* account-server
* object-server
* container-server
* admin-server
* proxy-server

All the rest should not need to be used externally.

closes #72 (ish)