Refactored to new Maven modules for bundle and test.