Tidy top level directory

Pulling in changes to directory structure from colin-combe:master