added folder tructures and renamed files