Move layer stuff to its own module