filesystem restructure cont.