Added new layer and moved several classes into the new layer