New folder structure for dev