removed unused classes
rearranged Thing class
removed unused file
small namechanges