Removed a few files in favor of fewer files