Clarified folder structure