BDDoc.Samples solution refactoring