Tidy up layout folder