Added pay-bill link and a lot of cleanup and reorg