Clean up Jasmine05 and 06 with better directory structure and naming conventions