Done some things to the structure

Done some things to the structure