Finished 2.0

Removed unused files, solutions and references.
Update some performance.