Fix class view && module builder