Cleaned up the package a bit