PLAYGROUND-142, refactoring for removing application_dir