Updated with stub manager and CLI Module

This is the initial commit for branching features