Update to new better version.

Changed phase 3 and naming conventions, improved many things.