Performed major code refactoring,organization, added Category database