Update project structure, remove "worker"