SOEN6471 Project for Refactoring Buddi System