Restructure filesystem
Actually move them