Added TimeHelper, Moved Helper classes