cleaned up package basics