Cleaning up to just have packages