Code reorganized + cross finder