Df clean code

Keep everything in this directory. Cleanup should be done after JH major changes.