Update thed base source code to work wth app module pattern