Delete some redundant packages and files. Rearranged directory structure