Discipleship is the point organized church. Of course, The Church (proper) is people, but organized church is for building people up in their identity in Christ and equipping them for the work of the ministry. "The work of the ministry" being multi-faceted and highly creative in terms or expression. In other words, ministry can be nearly almost anything as long as it ultimately points people to faith in Jesus. Oh come on, you know what I mean by "anything."
A MASSIVE element of discipleship is self-discipleship, or self-discipline. If we can become masters of self-discipline, the church would become much more mature, healthy and effective, no question. I think that's possible. The more people know who they are in Christ, the more they will live accordingly. The problem is that we have too much water under the bridge to our previous life (before Christ) that the hard wiring of our brains and hearts haven't full undergone transformation yet.