Petit filesystem restructure