Re organise files