Moved timers into separate classes - Closes #227