Cleaning structure and adding some config.