targets and sources model refactoring