Remove old unnecessary files.
Move Timeout module to its own file.