Reorganized form/enconuter/visit related classes into new .visit and .velocity subpackages
Improvements to unit tests
* Converted all unit test that were using deprecated test-data.xml/test-drugdata.xml to use test-concepts.xml
* Converted several tests that were using test-metadata.xml to use metadata bundles instead
* Simplified some tests with new TestUtils.save methods