fixed 1 of 2 heap bugs
removed duplicate includes and changed folder structure
fixed hash table bug, working on new bug