moved MergeTree, FSStatus, Status and Conflict to the client library. Also
renamed some stuff like Name -> FileName
removed the modules from the cabal file