Some refactors to files and Versioning Utils added