re-arranging folders and updating links
removing screen folder