reorganized jade file