Tidy top level directory

Tidy top level directory by pulling changes from colin-combe:master