Fixed previous folder restructure commit