Organizing dwbp repo