Reorganized code workflow