use proper names and folders