Fixed the subfoldering issue