SITA - files refactoring