adjust assembly; rename demo scripts