Updated Sources to v2.0

Preparing files for next major update.