moved conflicting files while updating filters

Signed-off-by: mienkoja <mienkoja@gmail.com>