Includes controllers and directives to controllers

Plus clean code