Move some things into a temporary package
Fix a couple errors