Moving classes to right place
creating new components and reorganizing delete functionnality