Try to keep on kernel folder
this is done in order to remove compatibility issues