Moved some standard stuff into a different package