changed fodler strucutre