Youssefbranch

small refractor + deleted some files