Removed the now unnecessary Layer class. Using a simple typedef instead.