Consistent naming
Move queue into its own package