Some refactoring + added Angular-seed