Added a class layout

removed unused classes