Switch to folder structure for nested apps.
Make testjs command more extendable