Re organize sample

Starting work on #59
Both of the mentioned types are imported and thus do not need fully qualified in the Javadoc. If your IDE is doing this, there's a setting to disable it.