Removed restart functionality.
Moved functions to individual modules.