Move dependencies were they belong.
Add components to architecture.
Fix javadoc warnings.