Added layout for different classes

deleted old main method