Done refactoring
Version control implemented. Now back on track