Adds UsagePointBuidler
Updates copyright
Refactors usage point import