Contined with refactoring adding ProjectBundle