refactoring HYG folders