Data Structures Overhaul - Cleanup and Reorganize