Moved file and fixed regex