Changed Structure and some little other things.