Modified sources to include namespace for App and instance, app