Moved watch onto dynamic file extensions