"Move" refactoring for interfaces
Merge branch 'file-refactoring'