Add subproject brefactor