Refactor/testing composer vcs

Initial changes to play around with vcs and composer.