Bump version to 2.0. Removed unnecessary @ in multiple classes