Tidied structure of RootController
Added watching for src and test changes to default gulp task