Move type functions into one script.

This moves all the type functionality into the type script. Until I figure out
a better way to organize it I will do things this way. Plus I don't have that
many, only 2 really, types so it's easy to organize for now. I may later use
prj to create scripts like I do for background jobs.
Remove unneeded type scripts
Merge branch 'master' into develop