Moved files and some fixes.
Several fixes + started extending Xflow tests.