Fixed typo
Performed file move & delete redundant folder