Cleanup started, classes for data structure created.