Refactor of facades to accomodate disease mapping
facades refactor + disease mapping