Re-organization, and added a simple test weapon