Reorganize import of angular, and wrap it in a module
Created wares