-Code cleanup to pack down old wrapper functions into appropriate entity classes

-Removed old research files

update #35