Now all the Tapster 2 parts are in the Tapster 2 directory.