Fixed folder formatting
Better handling of .fastq's in folders