Refactoring to extract every software into a single role