fixed bugs with iterator
moved queue files to subdirectory