Copied the boost org modular layout into master