Working changes. put teleportation into an own folder.
some cleaning up, latest changes for teleportation.