Move the worker folder to correct location, fix imports for worker tests