moved storage queue to a more appropriate place