Merge "Remove unnecessary dir 'legacy'"