Restructure filesystem