replaced files with better structure
Merge branch 'master' of https://github.com/rjellinek/vtime