new organization of folder, excluding tests