changed the folder strucutre