Refactoring

Unecessary coupling removal part1
Temp files unversioning