re-arrange directory structure