Organized into package structure, added graph classes