Refactor folders angular controller #159