Restructuring to a more standard layout