Addedd missing folder for new package
more code cleaning