Fixed typo
Re-organized sub-app