New folder structure and organization