Refactored packages, added more data structure utils, began Entity API