Restructuring repository: single repository for app and accessories