Restructure layer aspects