further filesystem restructure