Removed dist, added controllers & directives