Added oflademo; moved s3; consolidated pom into modules