adjusted file structure