More patches and refactoring of file structure for the patches