Refactor and moving files
Interim changes