Move components to seperate classes