Update folder structure
Error correction after folder reorganisation