Move MoovRelocator to the root library to share across templates and make upload.php more robust