Rename Package and Slight Cleanup