Minor structural changes
 - prefer annotation driven configuration over XML

Change-Id: I93c44e61dc731c87f7e3629e8f0c5a4266c6d24d