update year to 2013
move classes to separate files