changed filestructure and architecture