reorganizing
updating paths