slight filesystem restructure