~teejee2008/timeshift/trunk

223 by Tony George
Moved classes to separate files
1