cleaned up patches, reorganized into appropriate files, etc