Move extensions to Builder

Also add DbContext concrete to AddEntity extension