Added treasurer interface, rearranging some stuffs