Avoid an issue with the current version of directory_watcher
Break layout down into includes
Proof of concept post