Changed file structure to support mini-apps