Initial refactoring to new repository