Restructure layer aspects
Remove unused file
Restructuring