diff --git a/package.json b/package.json
index 5012d1155..1d59cf1aa 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "test-watch-android": "npm run pretest && concurrently --kill-others \"npm run tsc-tiw\" \"tns livesync android --path tests --watch\"",
     "test-watch-ios": "npm run pretest && concurrently --kill-others \"npm run tsc-tiw\" \"tns livesync ios --path tests --watch\"",
     "prepublish": "echo \"Development reminder: npm run setup\n\"",
-    "typedoc": "typedoc --tsconfig tsconfig.typedoc.json --out bin/dist/apiref --includeDeclarations --name NativeScript --theme ./node_modules/nativescript-typedoc-theme --excludeExternals --externalPattern tns-core-modules/module.d.ts tns-core-modules/tns-core-modules.d.ts",
+    "typedoc": "typedoc --tsconfig tsconfig.typedoc.json --out bin/dist/apiref --includeDeclarations --name NativeScript --theme ./node_modules/nativescript-typedoc-theme --excludeExternals --externalPattern \"**/+(tns-core-modules|module).d.ts\"",
     "dev-typedoc": "npm run typedoc && cd bin/dist/apiref && http-server",
     "test-tsc-es2016": "npm run tsc -- -p tsconfig.public.es2016.json",
     "tslint": "tslint --config build/tslint.json 'tns-core-modules/**/*.ts' 'tests/**/*.ts' 'apps/**/*.ts' -e '**/node_modules/**' -e '**/platforms/**'"
diff --git a/tns-core-modules/application-settings/application-settings.d.ts b/tns-core-modules/application-settings/application-settings.d.ts
index e6ce94746..788076644 100644
--- a/tns-core-modules/application-settings/application-settings.d.ts
+++ b/tns-core-modules/application-settings/application-settings.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "application-settings"
- * 
  * Allows you to save and restore any kind of information related to your application.
+ * @module "application-settings"
  */ /** */
 
 /**
diff --git a/tns-core-modules/application/application.d.ts b/tns-core-modules/application/application.d.ts
index a8d57b398..6ef5a70a5 100644
--- a/tns-core-modules/application/application.d.ts
+++ b/tns-core-modules/application/application.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "application"
- * 
  * Contains the application abstraction with all related methods.
+ * @module "application"
  */ /** */
 
 ///<reference path="../tns-core-modules.d.ts" /> Include global typings
diff --git a/tns-core-modules/color/color.d.ts b/tns-core-modules/color/color.d.ts
index db4a098e6..ee75d7941 100644
--- a/tns-core-modules/color/color.d.ts
+++ b/tns-core-modules/color/color.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "color"
- * 
  * Allows creating colors to be used when styling the UI.
+ * @module "color"
  */ /** */
 
 /**
diff --git a/tns-core-modules/connectivity/connectivity.d.ts b/tns-core-modules/connectivity/connectivity.d.ts
index 53ff8f360..e25eb72aa 100644
--- a/tns-core-modules/connectivity/connectivity.d.ts
+++ b/tns-core-modules/connectivity/connectivity.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "connectivity"
- * 
  * Contains connectivity utility methods.
+ * @module "connectivity"
  */ /** */
 
 /**
diff --git a/tns-core-modules/data/observable-array/observable-array.d.ts b/tns-core-modules/data/observable-array/observable-array.d.ts
index da118a340..e92829afa 100644
--- a/tns-core-modules/data/observable-array/observable-array.d.ts
+++ b/tns-core-modules/data/observable-array/observable-array.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "data/observable-array"
- * 
  * Contains the ObservableArray class, which is capable of detecting and responding to changes of a collection of objects.
+ * @module "data/observable-array"
  */ /** */
 
 // Test: http://jsperf.com/array-vs-observable-array-vs-array-observe
diff --git a/tns-core-modules/data/observable/observable.d.ts b/tns-core-modules/data/observable/observable.d.ts
index 10e6a4ed8..e8ebffbc9 100644
--- a/tns-core-modules/data/observable/observable.d.ts
+++ b/tns-core-modules/data/observable/observable.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "data/observable"
- * 
  * Contains the Observable class, which represents an observable object, or "data" in the model-view paradigm.
+ * @module "data/observable"
  */ /** */
 
 /**
diff --git a/tns-core-modules/data/virtual-array/virtual-array.d.ts b/tns-core-modules/data/virtual-array/virtual-array.d.ts
index 625884373..b5c9ab94d 100644
--- a/tns-core-modules/data/virtual-array/virtual-array.d.ts
+++ b/tns-core-modules/data/virtual-array/virtual-array.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "data/virtual-array"
- * 
  * Contains the VirtualArray class, which is an advanced array like class that helps loading items on demand.
+ * @module "data/virtual-array"
  */ /** */
 
 import * as observable from "../observable";
diff --git a/tns-core-modules/file-system/file-name-resolver/file-name-resolver.d.ts b/tns-core-modules/file-system/file-name-resolver/file-name-resolver.d.ts
index 2efdf7c69..8cbd7b0b4 100644
--- a/tns-core-modules/file-system/file-name-resolver/file-name-resolver.d.ts
+++ b/tns-core-modules/file-system/file-name-resolver/file-name-resolver.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "file-system/file-name-resolver"
- * 
  * Provides FileNameResolver class used for loading files based on device capabilities.
+ * @module "file-system/file-name-resolver"
  */ /** */
 
 export interface PlatformContext {
diff --git a/tns-core-modules/file-system/file-system.d.ts b/tns-core-modules/file-system/file-system.d.ts
index 5e96e7e69..b3b4f0676 100644
--- a/tns-core-modules/file-system/file-system.d.ts
+++ b/tns-core-modules/file-system/file-system.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "file-system"
- * 
  * Provides high-level abstractions for file system entities such as files, folders, known folders, paths, separators, etc.
+ * @module "file-system"
  */ /** */
 
 /**
diff --git a/tns-core-modules/fps-meter/fps-meter.d.ts b/tns-core-modules/fps-meter/fps-meter.d.ts
index 1902b133b..73e81688c 100644
--- a/tns-core-modules/fps-meter/fps-meter.d.ts
+++ b/tns-core-modules/fps-meter/fps-meter.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "fps-meter"
- * 
  * Allows you to capture the frames-per-second metrics of your application. 
+ * @module "fps-meter"
  */ /** */
 
 /**
diff --git a/tns-core-modules/http/http.d.ts b/tns-core-modules/http/http.d.ts
index 04c66b319..70e9c8e01 100644
--- a/tns-core-modules/http/http.d.ts
+++ b/tns-core-modules/http/http.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "http"
- * 
  * Allows you to send web requests and receive the responses.
+ * @module "http"
  */ /** */
 
 import * as image from "../image-source";
diff --git a/tns-core-modules/image-source/image-source.d.ts b/tns-core-modules/image-source/image-source.d.ts
index 82f966cae..b38cbf892 100644
--- a/tns-core-modules/image-source/image-source.d.ts
+++ b/tns-core-modules/image-source/image-source.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "image-source"
- * 
  * Contains the ImageSource class, which encapsulates the common abstraction behind a platform specific object (typically a Bitmap) that is used as a source for images.
+ * @module "image-source"
  */ /** */
 
 import * as imageAssetModule from "../image-asset";
diff --git a/tns-core-modules/platform/platform.d.ts b/tns-core-modules/platform/platform.d.ts
index a05f1addf..a7a9a08bb 100644
--- a/tns-core-modules/platform/platform.d.ts
+++ b/tns-core-modules/platform/platform.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "platform"
- * 
  * Contains all kinds of information about the device, its operating system and software.
+ * @module "platform"
  */ /** */
 
 /* tslint:disable:class-name */
diff --git a/tns-core-modules/text/formatted-string.d.ts b/tns-core-modules/text/formatted-string.d.ts
index 32136ca83..c0a4036a2 100644
--- a/tns-core-modules/text/formatted-string.d.ts
+++ b/tns-core-modules/text/formatted-string.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "text/formatted-string"
- * 
  * Contains the FormattedString and Span classes, which are used to create a formatted (rich text) strings.
+ * @module "text/formatted-string"
  */ /** */
 
 import { Span } from "./span";
diff --git a/tns-core-modules/text/text.d.ts b/tns-core-modules/text/text.d.ts
index b604cc0db..b6712ee26 100644
--- a/tns-core-modules/text/text.d.ts
+++ b/tns-core-modules/text/text.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "text"
- * 
  * Defines specific text related enumerations.
+ * @module "text"
  */ /** */
 
 /**
diff --git a/tns-core-modules/timer/timer.d.ts b/tns-core-modules/timer/timer.d.ts
index e21f7b4d7..99c033e64 100644
--- a/tns-core-modules/timer/timer.d.ts
+++ b/tns-core-modules/timer/timer.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "timer"
- * 
  * Allows you to create, start, stop and react to timers.
+ * @module "timer"
  */ /** */
 
 /**
diff --git a/tns-core-modules/trace/trace.d.ts b/tns-core-modules/trace/trace.d.ts
index f457eb1ea..268d152af 100644
--- a/tns-core-modules/trace/trace.d.ts
+++ b/tns-core-modules/trace/trace.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "trace"
- * 
  * Allows you to trace and print specific information based on categories.
+ * @module "trace"
  */ /** */
 
 /**
diff --git a/tns-core-modules/ui/action-bar/action-bar.d.ts b/tns-core-modules/ui/action-bar/action-bar.d.ts
index b8ceb697b..712d42686 100644
--- a/tns-core-modules/ui/action-bar/action-bar.d.ts
+++ b/tns-core-modules/ui/action-bar/action-bar.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/action-bar"
- * 
  * Contains the action bar related classes.
+ * @module "ui/action-bar"
  */ /** */
 
 import { EventData, ViewBase, View } from "../core/view";
diff --git a/tns-core-modules/ui/activity-indicator/activity-indicator.d.ts b/tns-core-modules/ui/activity-indicator/activity-indicator.d.ts
index ab33a27e2..ee9ed5a98 100644
--- a/tns-core-modules/ui/activity-indicator/activity-indicator.d.ts
+++ b/tns-core-modules/ui/activity-indicator/activity-indicator.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/activity-indicator"
- * 
  * Contains the ActivityIndicator class, which represents a widget for showing that something is currently busy.
+ * @module "ui/activity-indicator"
  */ /** */
 
 import { View } from "../core/view";
diff --git a/tns-core-modules/ui/border/border.d.ts b/tns-core-modules/ui/border/border.d.ts
index f24dcd712..9c7baf7df 100644
--- a/tns-core-modules/ui/border/border.d.ts
+++ b/tns-core-modules/ui/border/border.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/animation/keyframe-animation"
- * 
  * Contains the Border class, which represents a UI border component.
+ * @module "ui/animation/keyframe-animation"
  */ /** */
 
 import { ContentView } from "../content-view";
diff --git a/tns-core-modules/ui/button/button.d.ts b/tns-core-modules/ui/button/button.d.ts
index 3b49da21b..78e8a91dd 100644
--- a/tns-core-modules/ui/button/button.d.ts
+++ b/tns-core-modules/ui/button/button.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/button"
- * 
  * Contains the Button class, which represents a standard button widget.
+ * @module "ui/button"
  */ /** */
 
 import { TextBase, EventData } from "../text-base";
diff --git a/tns-core-modules/ui/content-view/content-view.d.ts b/tns-core-modules/ui/content-view/content-view.d.ts
index f57978ca8..917d8ac11 100644
--- a/tns-core-modules/ui/content-view/content-view.d.ts
+++ b/tns-core-modules/ui/content-view/content-view.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/content-view"
- * 
  * View that can host another view.
+ * @module "ui/content-view"
  */ /** */
 
 import { View, AddChildFromBuilder } from "../core/view";
diff --git a/tns-core-modules/ui/core/dependency-observable/dependency-observable.d.ts b/tns-core-modules/ui/core/dependency-observable/dependency-observable.d.ts
index 218d19db8..6279a4618 100644
--- a/tns-core-modules/ui/core/dependency-observable/dependency-observable.d.ts
+++ b/tns-core-modules/ui/core/dependency-observable/dependency-observable.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/core/dependency-observable"
- * 
  * Contains the DependencyObservable class, which represents an extended Observable object that uses Property instances for value backing mechanism.
+ * @module "ui/core/dependency-observable"
  */ /** */
 
 import { Observable, EventData } from "../../../data/observable";
diff --git a/tns-core-modules/ui/date-picker/date-picker.d.ts b/tns-core-modules/ui/date-picker/date-picker.d.ts
index dd0d5e9c8..69bd3f23f 100644
--- a/tns-core-modules/ui/date-picker/date-picker.d.ts
+++ b/tns-core-modules/ui/date-picker/date-picker.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/date-picker"
- * 
  * Contains the DatePicker class.
+ * @module "ui/date-picker"
  */ /** */
 
 import { View, Property } from "../core/view";
diff --git a/tns-core-modules/ui/dialogs/dialogs.d.ts b/tns-core-modules/ui/dialogs/dialogs.d.ts
index a7259c8ba..4d58c8252 100644
--- a/tns-core-modules/ui/dialogs/dialogs.d.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/dialogs"
- * 
  * Allows you to show different dialogs such as alerts, prompts, etc.
+ * @module "ui/dialogs"
  */ /** */
 
 /**
diff --git a/tns-core-modules/ui/frame/frame.d.ts b/tns-core-modules/ui/frame/frame.d.ts
index ac69b458c..a8fd4021e 100644
--- a/tns-core-modules/ui/frame/frame.d.ts
+++ b/tns-core-modules/ui/frame/frame.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/frame"
- * 
  * Contains the Frame class, which represents the logical View unit that is responsible for navigation within an application.
+ * @module "ui/frame"
  */ /** */
 
 import { Page, View, Observable, EventData } from "../page";
diff --git a/tns-core-modules/ui/gestures/gestures.d.ts b/tns-core-modules/ui/gestures/gestures.d.ts
index 68ebb516d..53394c393 100644
--- a/tns-core-modules/ui/gestures/gestures.d.ts
+++ b/tns-core-modules/ui/gestures/gestures.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/gestures"
- * 
  * Contains the GesturesObserver class, which lets you observe and respond to user gestures.
+ * @module "ui/gestures"
  */ /** */
 
 import { View, EventData } from "../core/view";
diff --git a/tns-core-modules/ui/html-view/html-view.d.ts b/tns-core-modules/ui/html-view/html-view.d.ts
index 20558528a..d7f9047bd 100644
--- a/tns-core-modules/ui/html-view/html-view.d.ts
+++ b/tns-core-modules/ui/html-view/html-view.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/html-view"
- * 
  * Contains the HtmlView class, which represents a standard html view widget.
+ * @module "ui/html-view"
  */ /** */
 
 import { View, Property } from "../core/view";
diff --git a/tns-core-modules/ui/image-cache/image-cache.d.ts b/tns-core-modules/ui/image-cache/image-cache.d.ts
index 72ead9103..8d909bf31 100644
--- a/tns-core-modules/ui/image-cache/image-cache.d.ts
+++ b/tns-core-modules/ui/image-cache/image-cache.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/image-cache"
- * 
  * Contains the Cache class, which handles image download requests and caches the already downloaded images.
+ * @module "ui/image-cache"
  */ /** */
 
 import * as observable from "../../data/observable";
diff --git a/tns-core-modules/ui/image/image.d.ts b/tns-core-modules/ui/image/image.d.ts
index dbb51a254..08aef26e0 100644
--- a/tns-core-modules/ui/image/image.d.ts
+++ b/tns-core-modules/ui/image/image.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/image"
- * 
  * Contains the Image class, which represents an image widget.
+ * @module "ui/image"
  */ /** */
 
 import { View, Property, InheritedCssProperty, Color, Style } from "../core/view";
diff --git a/tns-core-modules/ui/label/label.d.ts b/tns-core-modules/ui/label/label.d.ts
index 1afe5431f..cd6a6f2c1 100644
--- a/tns-core-modules/ui/label/label.d.ts
+++ b/tns-core-modules/ui/label/label.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/label"
- * 
  * Contains the Label class, which represents a standard label widget.
+ * @module "ui/label"
  */ /** */
 
 import { TextBase } from "../text-base";
diff --git a/tns-core-modules/ui/list-picker/list-picker.d.ts b/tns-core-modules/ui/list-picker/list-picker.d.ts
index 34da6d4f5..079441b35 100644
--- a/tns-core-modules/ui/list-picker/list-picker.d.ts
+++ b/tns-core-modules/ui/list-picker/list-picker.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/list-picker"
- * 
  * Contains the ListPicker class.
+ * @module "ui/list-picker"
  */ /** */
 
 import { View, Property } from "../core/view";
diff --git a/tns-core-modules/ui/list-view/list-view.d.ts b/tns-core-modules/ui/list-view/list-view.d.ts
index 029e55dd3..d542b7f95 100644
--- a/tns-core-modules/ui/list-view/list-view.d.ts
+++ b/tns-core-modules/ui/list-view/list-view.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/list-view"
- * 
  * Contains the ListView class, which represents a standard list view widget.
+ * @module "ui/list-view"
  */ /** */
 
 import { EventData, View, Template, KeyedTemplate, Length, Property, CssProperty, Color, Style } from "../core/view";
diff --git a/tns-core-modules/ui/page/page.d.ts b/tns-core-modules/ui/page/page.d.ts
index e1a8b2eac..e9380168f 100644
--- a/tns-core-modules/ui/page/page.d.ts
+++ b/tns-core-modules/ui/page/page.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/page"
- * 
  * Contains the Page class, which represents a logical unit for navigation inside a Frame.
+ * @module "ui/page"
  */ /** */
 
 ///<reference path="../../tns-core-modules.d.ts" /> Include global typings
diff --git a/tns-core-modules/ui/placeholder/placeholder.d.ts b/tns-core-modules/ui/placeholder/placeholder.d.ts
index 35fa3052b..0107e99b1 100644
--- a/tns-core-modules/ui/placeholder/placeholder.d.ts
+++ b/tns-core-modules/ui/placeholder/placeholder.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/placeholder"
- * 
  * Contains the Placeholder class, which is used to add a native view to the visual tree.
+ * @module "ui/placeholder"
  */ /** */
 
 import { View, EventData } from "../core/view";
diff --git a/tns-core-modules/ui/progress/progress.d.ts b/tns-core-modules/ui/progress/progress.d.ts
index 7664bbc81..f53c30bb8 100644
--- a/tns-core-modules/ui/progress/progress.d.ts
+++ b/tns-core-modules/ui/progress/progress.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/progress"
- * 
  * Contains the Progress class, which represents a component capable of showing progress.
+ * @module "ui/progress"
  */ /** */
 
 import { View, Property } from "../core/view";
diff --git a/tns-core-modules/ui/repeater/repeater.d.ts b/tns-core-modules/ui/repeater/repeater.d.ts
index 33bc6c60c..d902f0c98 100644
--- a/tns-core-modules/ui/repeater/repeater.d.ts
+++ b/tns-core-modules/ui/repeater/repeater.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/repeater"
- * 
  * Contains the Repeater class, which represents a UI Repeater component.
+ * @module "ui/repeater"
  */ /** */
 
 import { LayoutBase, CustomLayoutView, Template, Property } from "../layouts/layout-base";
diff --git a/tns-core-modules/ui/scroll-view/scroll-view.d.ts b/tns-core-modules/ui/scroll-view/scroll-view.d.ts
index 9bd697eff..ee3c35642 100644
--- a/tns-core-modules/ui/scroll-view/scroll-view.d.ts
+++ b/tns-core-modules/ui/scroll-view/scroll-view.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/scroll-view"
- * 
  * Contains the ScrollView class, which represents a scrollable area that can have content that is larger than its bounds.
+ * @module "ui/scroll-view"
  */ /** */
 
 import { ContentView, EventData, Property } from "../content-view";
diff --git a/tns-core-modules/ui/search-bar/search-bar.d.ts b/tns-core-modules/ui/search-bar/search-bar.d.ts
index 5efe69b56..849ffbbb3 100644
--- a/tns-core-modules/ui/search-bar/search-bar.d.ts
+++ b/tns-core-modules/ui/search-bar/search-bar.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/search-bar"
- * 
  * Contains the SearchBar class, which represents a standard search bar component.
+ * @module "ui/search-bar"
  */ /** */
 
 import { View, Property, EventData, Color } from "../core/view";
diff --git a/tns-core-modules/ui/slider/slider.d.ts b/tns-core-modules/ui/slider/slider.d.ts
index a726c722f..f601c9254 100644
--- a/tns-core-modules/ui/slider/slider.d.ts
+++ b/tns-core-modules/ui/slider/slider.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/slider"
- * 
  * Contains the Slider class, which represents a standard slider component.
+ * @module "ui/slider"
  */ /** */
 
 import { View, Property, CoercibleProperty } from "../core/view";
diff --git a/tns-core-modules/ui/switch/switch.d.ts b/tns-core-modules/ui/switch/switch.d.ts
index 38b8626be..6d935f80a 100644
--- a/tns-core-modules/ui/switch/switch.d.ts
+++ b/tns-core-modules/ui/switch/switch.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/switch"
- * 
  * Contains the Switch class, which represents a standard switch component.
+ * @module "ui/switch"
  */ /** */
 
 import { View, Property } from "../core/view";
diff --git a/tns-core-modules/ui/tab-view/tab-view.d.ts b/tns-core-modules/ui/tab-view/tab-view.d.ts
index dc6e9a74d..990057e46 100644
--- a/tns-core-modules/ui/tab-view/tab-view.d.ts
+++ b/tns-core-modules/ui/tab-view/tab-view.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/tab-view"
- * 
  * Contains the TabView class, which represents a standard content component with tabs.
+ * @module "ui/tab-view"
  */ /** */
 
 import { View, ViewBase, Property, CssProperty, Style, EventData, Color } from "../core/view";
diff --git a/tns-core-modules/ui/text-field/text-field.d.ts b/tns-core-modules/ui/text-field/text-field.d.ts
index 4cc16bf1c..424b03992 100644
--- a/tns-core-modules/ui/text-field/text-field.d.ts
+++ b/tns-core-modules/ui/text-field/text-field.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/text-base"
- * 
  * Contains the TextField class, which represents an editable single-line box.
+ * @module "ui/text-base"
  */ /** */
 
 import { EditableTextBase, Property } from "../editable-text-base";
diff --git a/tns-core-modules/ui/text-view/text-view.d.ts b/tns-core-modules/ui/text-view/text-view.d.ts
index 48e93f40b..7480d357d 100644
--- a/tns-core-modules/ui/text-view/text-view.d.ts
+++ b/tns-core-modules/ui/text-view/text-view.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/text-view"
- * 
  * Contains the TextView class, which represents an editable multi-line line box.
+ * @module "ui/text-view"
  */ /** */
 
 import { EditableTextBase } from "../editable-text-base";
diff --git a/tns-core-modules/ui/time-picker/time-picker.d.ts b/tns-core-modules/ui/time-picker/time-picker.d.ts
index 2b02a19c5..2dda072ef 100644
--- a/tns-core-modules/ui/time-picker/time-picker.d.ts
+++ b/tns-core-modules/ui/time-picker/time-picker.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/time-picker"
- * 
  * Contains the TimePicker class.
+ * @module "ui/time-picker"
  */ /** */
 
 import { View, Property } from "../core/view";
diff --git a/tns-core-modules/ui/web-view/web-view.d.ts b/tns-core-modules/ui/web-view/web-view.d.ts
index 4bf0db6ee..02e02ca34 100644
--- a/tns-core-modules/ui/web-view/web-view.d.ts
+++ b/tns-core-modules/ui/web-view/web-view.d.ts
@@ -1,7 +1,6 @@
 /**
- * @module "ui/transition"
- * 
  * Contains the WebView class, which represents a standard browser widget.
+ * @module "ui/transition"
  */ /** */
 
 import { View, Property, EventData } from "../core/view";
diff --git a/tns-core-modules/xml/xml.d.ts b/tns-core-modules/xml/xml.d.ts
index e272df174..1dfb68b7e 100644
--- a/tns-core-modules/xml/xml.d.ts
+++ b/tns-core-modules/xml/xml.d.ts
@@ -1,6 +1,6 @@
 /**
- * @module "xml"
  * Contains the XmlParser class, which is a SAX parser using the easysax implementation.
+ * @module "xml"
  */ /** */
 
 /**