adding modules from initial branch split