Moved ngInclude statements around