Change folder structure and replace some test materials