refactored for qa/prod and new project structure