Moved layers to it's own enum and header