Deprecate/delete files from old system. Progress on issue #16.