changed folder struc