Refactorings due to moving classes to Legacy dir