Moved signals to separate files