Changed layout to folder