Move classes to respective files and add timer to close notification after 5 seconds