Minor restructuring and new application scenario set up.
Minor restructure 2.0