pruned some files and reorganized