adjusted folder structure