maestro scripts and configs refactoring