modified folder struc