Conform to boost directory structure

Hi Hardy,

This pull request tidies up the directory structure a little.