Reorganized layout; Got CDH4 working