Finishing the breaking out of generic expense and patient distribution

In this PR generic expense and patient distribution are now broken out.