Moved classes to module and timer
Moved classes to files