renamed some classes and filled in missing id
minor: rearrange code
remove outdate junk