Moved timer into new class
The classes have all been moved into modules