Moved legacy back to the root
Additional fixes