Purged some cruft, added wrapper for files and JSON.