HUGE filesystem restructuring