Get fuzz test working
Move old files into __deprecated