Filestructure change

Basically Init4