Moved files around to work correctly with xtuple-extensions