Changed Structure and Scripts