Move source files under Utils.Yukari
Fix up some stale errors
Update the cabal file