Moved duplicate classes to one main area. Converted to maven.