Refactored queue files and moved scoring queue out of commons queue