Added methods to improve the match starting progress and rearanged
folders