changed the folder architecture