Re-factor worker project structure