Change Hype structure
Merge files