improved folder structure