#200 renaming Decorator to Wrapper, Adding Javadoc, Factory to FactoryMethod, cleanup