Remove old Wiz code
Clean up
Move data directory