Rework using Bakery with a simple directory structure.
Merge pull request #1 from rideliner/bakery

Rework using Bakery with a simple directory structure.