#36 - almost ready, only paths to files will be changed