Moved interrupt handlers to seperate file