Reorganize repository

We should have two/three folders in dan/ to orgnaize the code more cleanly.