Improved Mockito example, reorganized packages