began refactoring components to support several VCS binaries