Refacgtor vocabulary into module