Organized the Layer class