Finish moving code around.
Update cabal file.