Moved enums region
Moved code from layer to layers class