Main class added. Components moved