#5 Starting Team Builder and DataSource refactoring