refactoring and cleaned up scoreboard references
refactoring in different packages