Prepared package for refactoring
Added Angular dep