Rearrange structure

Some mistakes were made.