New folder structure + debug test on collection changes