Clean Up and Sorted Into Packages