You should have masters long before you need to dig for the treasure.

Also, it takes much more for a villager to go from "Adept" to "Master" than it does to go from "Trainee" to "Adept".

In between other puzzles that require builders, if they don't do it themselves, drop them on the huts. They'll fix them up and it will give them more experience.