More files setup and tested.

More files setup and tested.