compatible with -import@0.2.0 and removed timemachine

i replaced files. don't bother with the diff. trust me on that one :P