Removing unnecessary packages and reorganizing