Restructure file system in client/app