FileHelper refactoring
Build hierarchy