V2.0

Cleanup folders and config files.