Restructure of logical layout