Add AndOrTree and AndOrNode. Cleanup in work dir