Renamed data structures file and added logging and search