Restructuring for Community repository.