Restructure stagedir and moviepath