Refactored more classess
Refactoring of lib/prod and tweaking angular