Re-factorization of source code to use sub-module/applications