Refactor code filenames, specify what is a wrapper, etc

Also clean unused code in tests