Updated files; only file encode/decode functions and tests for them remain