Massive dir cleanup. Adding Tapster 2 files.