renamed folder structure