diff --git a/doc/examples/originalComponents/services/cities_by_area/html.template b/doc/examples/originalComponents/services/cities_by_area/html.template
deleted file mode 100644
index a64c9d2664626a678c7fe3127a6d6dcc2eda2239..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/cities_by_area/html.template
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Largest cities by area</title>
- <style>
- body{font: 11px sans-serif;}
- </style>
- </head>
- <body>
- <h2>Largest cities by area</h2>
- {{models.main|GoogleMaps:"latitude,longitude,areaAndName,width=800"}}
-</body>
-</html>
\ No newline at end of file
diff --git a/doc/examples/originalComponents/services/cities_by_area/queries/main.query b/doc/examples/originalComponents/services/cities_by_area/queries/main.query
deleted file mode 100644
index 2b4c9d3510b857909edaee2a79d7022d01f00db0..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/cities_by_area/queries/main.query
+++ /dev/null
@@ -1,19 +0,0 @@
-#Get the 10 largest cities by area in the US
-
-PREFIX dcterms: <http://purl.org/dc/terms/>
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX dbp: <http://dbpedia.org/property/>
-PREFIX sch: <http://schema.org/>
-PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-SELECT DISTINCT ?city SAMPLE(?lat) AS ?latitude SAMPLE(?long) AS ?longitude CONCAT(?city, "<br>(", xsd:string(?area), " SqKM)") AS ?areaAndName WHERE{
- ?city a sch:City ;
- <http://dbpedia.org/ontology/country> <http://dbpedia.org/resource/United_States> ;
- geo:lat ?lat ;
- geo:long ?long;
- dbp:areaTotalKm ?area .
-
-}GROUP BY ?city ?area
-ORDER BY DESC(?area)
-LIMIT 10
diff --git a/doc/examples/originalComponents/services/classes/html.template b/doc/examples/originalComponents/services/classes/html.template
new file mode 100644
index 0000000000000000000000000000000000000000..51134ef931e908641a3560b63a388e7e74595300
--- /dev/null
+++ b/doc/examples/originalComponents/services/classes/html.template
@@ -0,0 +1,11 @@
+{%include "../../includes/header.inc"%}
+ <div class="container-fluid">
+ <h1>Classes available</h1>
+ <ul>
+ {% for row in models.main %}
+ <li><a href="{{lodspk.baseUrl}}instances/{{ row.resource.curie }}">{{row.resource.curie}}</a></li>
+ {% endfor %}
+ </ul>
+ </div>
+ </body>
+</html>
diff --git a/doc/examples/originalComponents/services/classes/queries/main.query b/doc/examples/originalComponents/services/classes/queries/main.query
new file mode 100644
index 0000000000000000000000000000000000000000..4867af70420f6f3834fa499aa72e99746b924509
--- /dev/null
+++ b/doc/examples/originalComponents/services/classes/queries/main.query
@@ -0,0 +1,10 @@
+SELECT DISTINCT ?resource WHERE {
+ {
+ GRAPH ?g {
+ ?x a ?resource .
+ }
+ }UNION{
+ ?x a ?resource .
+ }
+}order by ?resource
+LIMIT {{lodspk.maxResults}}
diff --git a/doc/examples/originalComponents/services/heinlein_and_bradbury/html.template b/doc/examples/originalComponents/services/heinlein_and_bradbury/html.template
deleted file mode 100644
index 83e202bd6efdaa9daea02aa3c746aec1fa59ac32..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/heinlein_and_bradbury/html.template
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>People influenced by Robert Heinlein and Ray Bradbury</title>
- <style>body{font: 10px sans-serif;}</style>
- </head>
- <body>
- <h2>People influenced by Robert Heinlein and Ray Bradbury</h2>
- {{models.main|D3ForceGraph:"child,parent"}}
- </body>
-</html>
-
diff --git a/doc/examples/originalComponents/services/heinlein_and_bradbury/queries/main.query b/doc/examples/originalComponents/services/heinlein_and_bradbury/queries/main.query
deleted file mode 100644
index f1da7574a1bcf3e93a8c3129dd4e9d9dc156d347..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/heinlein_and_bradbury/queries/main.query
+++ /dev/null
@@ -1,15 +0,0 @@
-#Get all the people that has been influenced by Heinlein AND Bradbury
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX dbp: <http://dbpedia.org/ontology/>
-PREFIX d: <http://dbpedia.org/resource/>
-
-SELECT DISTINCT ?child ?parent WHERE{
- ?childNode dbp:influencedBy ?parentNode;
- dbp:influencedBy d:Robert_A._Heinlein;
- dbp:influencedBy d:Ray_Bradbury;
- rdfs:label ?child .
- ?parentNode rdfs:label ?parent .
- FILTER(LANG(?child) = "en" && LANG(?parent) = "en")
- FILTER(?parentNode = d:Robert_A._Heinlein || ?parentNode = d:Ray_Bradbury )
-}
-
diff --git a/doc/examples/originalComponents/services/kubrick_filmography/html.template b/doc/examples/originalComponents/services/kubrick_filmography/html.template
deleted file mode 100644
index f626d821d9a094174286dc9239bdf953c83d2d0d..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/kubrick_filmography/html.template
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>My visualization</title>
- </head>
- <body>
- <!--
- The width=1000, color=steelblue and dateFormat='%Y' are optional
- -->
-{{models.main|Timeknot:"releaseDate,label,color=steelblue,width=1000,dateFormat='%Y'"}} </body>
-</html>
-
diff --git a/doc/examples/originalComponents/services/kubrick_filmography/queries/main.query b/doc/examples/originalComponents/services/kubrick_filmography/queries/main.query
deleted file mode 100644
index 1c6089feb46c9526d3c50b3b488c0dd3f87cfcad..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/kubrick_filmography/queries/main.query
+++ /dev/null
@@ -1,15 +0,0 @@
-#Get all the movies directed by Stanley Kubrick that have a release date
-#The MAX function is a tricky way of obtaining just one value in case there are multiple dates associated
-
-PREFIX dbp: <http://dbpedia.org/resource/>
-PREFIX dbo: <http://dbpedia.org/ontology/>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-SELECT ?movie ?label MAX(?r) AS ?releaseDate WHERE{
- ?movie dbo:director dbp:Stanley_Kubrick ;
- rdfs:label ?label;
- dbo:releaseDate ?r .
-
- #Filter forces to get only the label in english
- FILTER( LANG(?label) = "en")
-}GROUP BY ?movie ?label
\ No newline at end of file
diff --git a/doc/examples/originalComponents/services/lamborghini_cars/html.template b/doc/examples/originalComponents/services/lamborghini_cars/html.template
deleted file mode 100644
index e75c1e9c0f12eca8624b31f13255d13f19dff071..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/lamborghini_cars/html.template
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Measures of different models of Lamborghini cars</title>
- <style>body{font: 11px sans-serif;}</style>
- </head>
- <body>
- <h2>Measures of different models of Lamborghini cars</h2>
- {{models.main|D3ParallelCoordinates:"carLabel,wheelbase,carWidth,carLength,transmission,height=300"}}
- </body>
-</html>
-
diff --git a/doc/examples/originalComponents/services/lamborghini_cars/queries/main.query b/doc/examples/originalComponents/services/lamborghini_cars/queries/main.query
deleted file mode 100644
index 3feb26c55ce0237462db745e47624d78f7130091..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/lamborghini_cars/queries/main.query
+++ /dev/null
@@ -1,13 +0,0 @@
-#Get a bunch of numbers related to Lamborghini cars
-PREFIX dcterms: <http://purl.org/dc/terms/>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-SELECT ?carLabel ?wheelbase ?carWidth ?carLength ?transmission WHERE {
- ?car dcterms:subject <http://dbpedia.org/resource/Category:Lamborghini_vehicles>;
- <http://dbpedia.org/ontology/Automobile/wheelbase> ?wheelbase;
- <http://dbpedia.org/ontology/MeanOfTransportation/height> ?carWidth;
- <http://dbpedia.org/ontology/MeanOfTransportation/length> ?carLength;
- <http://dbpedia.org/property/transmission> ?transmission;
- rdfs:label ?carLabel.
- FILTER(LANG(?carLabel) = "en")
-}
diff --git a/doc/examples/originalComponents/services/nobel_laureates_by_country/html.template b/doc/examples/originalComponents/services/nobel_laureates_by_country/html.template
deleted file mode 100644
index 130678d8fa295e438888cb8f243cc72e0759b591..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/nobel_laureates_by_country/html.template
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Total of Nobel laureates in Physics by country</title>
- <style>
- body{font: 11px sans-serif;}
- </style>
- </head>
- <body>
- <h2>Total of Nobel laureates in Physics by country</h2>
- {{models.main|GoogleVizPieChart:"countryLabel,total,width=900,height=500"}}
-</body>
-</html>
\ No newline at end of file
diff --git a/doc/examples/originalComponents/services/nobel_laureates_by_country/queries/main.query b/doc/examples/originalComponents/services/nobel_laureates_by_country/queries/main.query
deleted file mode 100644
index f4124d786a53d1c56ca85b1ed42dc3b21bc41a90..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/nobel_laureates_by_country/queries/main.query
+++ /dev/null
@@ -1,17 +0,0 @@
-#Number of nobel prize winners by country
-PREFIX dcterms: <http://purl.org/dc/terms/>
-PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX dbp: <http://dbpedia.org/property/>
-PREFIX sch: <http://schema.org/>
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-
-SELECT ?countryLabel (COUNT(?nobel) as ?total) WHERE {
- ?nobel dcterms:subject <http://dbpedia.org/resource/Category:Nobel_laureates_in_Physics>;
- a foaf:Person;
- dbp:placeOfBirth ?country .
- ?country a sch:Country ;
- rdfs:label ?countryLabel
- FILTER(LANG(?countryLabel) = "en")
-}GROUP BY ?country ?countryLabel
-ORDER BY DESC(?total)
-LIMIT 100
diff --git a/doc/examples/originalComponents/services/people_influenced_by_neruda/html.template b/doc/examples/originalComponents/services/people_influenced_by_neruda/html.template
deleted file mode 100644
index 713cb5c5cb4e24d91236c51db1a2c3173f5b7d41..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/people_influenced_by_neruda/html.template
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>People influenced by Pablo Neruda</title>
- <style>body{font: 10px sans-serif}</style>
- </head>
- <body>
- <h2>People influenced by Pablo Neruda</h2>
- {{models.main|D3Dendrogram:"child,parent"}}
- </body>
-</html>
-
diff --git a/doc/examples/originalComponents/services/people_influenced_by_neruda/queries/main.query b/doc/examples/originalComponents/services/people_influenced_by_neruda/queries/main.query
deleted file mode 100644
index 805f26d45e5ecd8cebd4c222133e2d0770f18fd4..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/people_influenced_by_neruda/queries/main.query
+++ /dev/null
@@ -1,27 +0,0 @@
-#People influenced by Pablo Neruda
-#Beware this query is tricky, in SPARQL 1.1 it should be much simpler
-
-PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX dbp: <http://dbpedia.org/ontology/>
-PREFIX d: <http://dbpedia.org/resource/>
-SELECT DISTINCT ?child ?parent WHERE{
- {
- ?childNode dbp:influencedBy ?mid ;
- rdfs:label ?child .
- ?mid dbp:influencedBy ?parentNode;
- rdfs:label ?parent .
- FILTER(LANG(?parent) = "en" && ?parentNode = d:Pablo_Neruda)
- }UNION{
- ?childNode dbp:influencedBy d:Pablo_Neruda;
- dbp:influencedBy ?parentNode;
- rdfs:label ?child .
- ?parentNode rdfs:label ?parent .
-
- FILTER(LANG(?parent) = "en" && ?parentNode = d:Pablo_Neruda)
- }UNION{
- d:Pablo_Neruda rdfs:label ?child
- }
- FILTER(LANG(?child) = "en")
-
-}
-
diff --git a/doc/examples/originalComponents/services/places_in_rensselaer_county_by_area/html.template b/doc/examples/originalComponents/services/places_in_rensselaer_county_by_area/html.template
deleted file mode 100644
index 5a164e6612b7ca4c36f7758c7e6d9b738bbffbed..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/places_in_rensselaer_county_by_area/html.template
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8">
- <title>Places in Rensselaer county by area</title>
- <style>body{font: 10px sans-serif}</style>
- </head>
- <body>
- <h2>Places in Rensselaer county by area</h2>
- {{models.main|D3CirclePacking:"s,c,area"}}
- </body>
-</html>
\ No newline at end of file
diff --git a/doc/examples/originalComponents/services/places_in_rensselaer_county_by_area/queries/main.query b/doc/examples/originalComponents/services/places_in_rensselaer_county_by_area/queries/main.query
deleted file mode 100644
index 125dca58c0c787bbeec641ff0e0d9a16d12982d3..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/places_in_rensselaer_county_by_area/queries/main.query
+++ /dev/null
@@ -1,19 +0,0 @@
-#Get places in Rensselaer county and their area
-PREFIX d: <http://dbpedia.org/ontology/>
-
-SELECT max(?sLabel) as ?s max(?cLabel) as ?c (max(?t) as ?area) WHERE{
- {
- ?s d:isPartOf <http://dbpedia.org/resource/Rensselaer_County,_New_York>;
- d:areaTotal ?t ;
- rdfs:label ?sLabel;
- d:isPartOf ?c .
- ?c rdfs:label ?cLabel.
- FILTER(?c = <http://dbpedia.org/resource/Rensselaer_County,_New_York>)
- FILTER(lang(?cLabel) = "en")
- }UNION{
- ?s rdfs:label ?sLabel .
- FILTER(?s = <http://dbpedia.org/resource/Rensselaer_County,_New_York>)
- }
-FILTER(lang(?sLabel) = "en")
-
-}group by ?sLabel ?cLabel
diff --git a/doc/examples/originalComponents/services/rush/html.template b/doc/examples/originalComponents/services/rush/html.template
deleted file mode 100644
index eee4209fb3446ce8798cc9791f65af753c4c154d..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/rush/html.template
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>My visualization</title>
- </head>
- <body>
-{{models.main|D3WordCloud:"words"}} </body>
-</html>
-
diff --git a/doc/examples/originalComponents/services/rush/queries/main.query b/doc/examples/originalComponents/services/rush/queries/main.query
deleted file mode 100644
index cb3e50406546579e3236d9ae443cb8ac1f4c49b7..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/rush/queries/main.query
+++ /dev/null
@@ -1,5 +0,0 @@
-#Words in any literal related to Rush
-SELECT ?words WHERE{
- <http://dbpedia.org/resource/Rush_(band)> ?p ?words .
- FILTER(LANG(?words) = "en")
-}
diff --git a/doc/examples/originalComponents/services/schoolmap/html.template b/doc/examples/originalComponents/services/schoolmap/html.template
deleted file mode 100644
index 3a938be9eca4341512407b26d317d9b3c6634759..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/schoolmap/html.template
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- </head>
- <body>
- {{models.education_uk.main|GoogleMaps:"lat,long,name"}}
- </body>
-</html>
diff --git a/doc/examples/originalComponents/services/schoolmap/queries/endpoint.education_uk/main.query b/doc/examples/originalComponents/services/schoolmap/queries/endpoint.education_uk/main.query
deleted file mode 100644
index c2e75690ba19597755b341fd9ad6f831ebb6e16d..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/schoolmap/queries/endpoint.education_uk/main.query
+++ /dev/null
@@ -1,13 +0,0 @@
-#Get schools in the City of London district, including geolocation and name
-
-PREFIX sch-ont: <http://education.data.gov.uk/def/school/>
-PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
-
-SELECT ?school ?name ?lat ?long WHERE {
- ?school a sch-ont:School;
- sch-ont:establishmentName ?name;
- geo:lat ?lat;
- geo:long ?long;
- sch-ont:districtAdministrative <http://statistics.data.gov.uk/id/local-authority-district/00AA>.
-}
-ORDER BY ?name
diff --git a/doc/examples/originalComponents/services/triples_in_a_table/html.template b/doc/examples/originalComponents/services/triples_in_a_table/html.template
deleted file mode 100644
index a44bcd917a7430855316cf9c462a8bac48c3b148..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/triples_in_a_table/html.template
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <style>
- body{font: 11px sans-serif;}
- </style>
- <title>A set of triples in a Google table</title>
- </head>
- <body>
- <h2>A set of triples in a Google table</h2>
- {{models.main|GoogleVizTable:"s.curie,p.curie,o.curie"}}
- </body>
-</html>
-
diff --git a/doc/examples/originalComponents/services/triples_in_a_table/queries/main.query b/doc/examples/originalComponents/services/triples_in_a_table/queries/main.query
deleted file mode 100644
index 18a2c5f3e3ba63cb19cb218dcf0a1289ed3f8057..0000000000000000000000000000000000000000
--- a/doc/examples/originalComponents/services/triples_in_a_table/queries/main.query
+++ /dev/null
@@ -1,6 +0,0 @@
-#Get any 20 triples
-
-SELECT * WHERE {
- ?s ?p ?o
-}
-LIMIT 20
diff --git a/doc/examples/originalComponents/types/rdfs:Resource/html.template b/doc/examples/originalComponents/types/rdfs:Resource/html.template
new file mode 100644
index 0000000000000000000000000000000000000000..a621c5847df0b4e444f636c418b058f6b6f52cb5
--- /dev/null
+++ b/doc/examples/originalComponents/types/rdfs:Resource/html.template
@@ -0,0 +1,41 @@
+{%include "../../includes/header.inc"%}
+ <div class="container-fluid">
+ <h1>Default view</h1>
+
+ <table class="table table-striped" about="{{uri}}">
+ <thead>
+ <tr><th>Subject</th><th>Predicate</th><th>Object</th></tr>
+ </thead>
+ {% for row in models.po %}
+ <tr>
+<td>{%if forloop.first%}<a href='{{lodspk.this.value}}'>{{lodspk.this.curie}}</a>{%endif%}</td>
+ <td><a href='{{row.p.value}}'>{{row.p.curie}}</a></td>
+
+ <td>
+ {%if row.o.uri == 1%}
+ <a rel='{{row.p.value}}' href='{{row.o.value}}'>{{row.o.curie}}</a>
+ {%else%}
+ <span property='{{row.p.value}}'>{{row.o.value}}</span>
+ {%endif%}
+ </td>
+
+ </tr>
+ {% endfor %}
+
+ {% for row in models.sp %}
+ <tr>
+ <td><a href='{{row.s.value}}'>{{row.s.curie}}</a></td>
+
+ <td><a rev='{{row.s.value}}' href='{{row.p.value}}'>{{row.p.curie}}</a></td>
+<td>{%if forloop.first%}<a href='{{lodspk.this.value}}'>{{lodspk.this.curie}}</a>{%endif%}</td>
+ </tr>
+ {% endfor %}
+ <thead>
+ <tr><th>Subject</th><th>Predicate</th><th>Object</th></tr>
+ </thead>
+
+ </table>
+ </div>
+
+ </body>
+</html>
diff --git a/doc/examples/originalComponents/types/rdfs:Resource/queries/po.query b/doc/examples/originalComponents/types/rdfs:Resource/queries/po.query
new file mode 100644
index 0000000000000000000000000000000000000000..de4e096b29a58deb387645e10b01e30945d0816b
--- /dev/null
+++ b/doc/examples/originalComponents/types/rdfs:Resource/queries/po.query
@@ -0,0 +1,9 @@
+SELECT ?p ?o WHERE {
+ {
+ GRAPH ?g{
+ <{{uri}}> ?p ?o.
+ }
+ }UNION{
+ <{{uri}}> ?p ?o .
+ }
+}LIMIT {{lodspk.maxResults}}
diff --git a/doc/examples/originalComponents/types/rdfs:Resource/queries/sp.query b/doc/examples/originalComponents/types/rdfs:Resource/queries/sp.query
new file mode 100644
index 0000000000000000000000000000000000000000..db705ad3eb5f9e202f0ae31072ff84ced9d51d0d
--- /dev/null
+++ b/doc/examples/originalComponents/types/rdfs:Resource/queries/sp.query
@@ -0,0 +1,9 @@
+SELECT ?s ?p WHERE {
+ {
+ GRAPH ?g{
+ ?s ?p <{{uri}}> .
+ }
+ }UNION{
+ ?s ?p <{{uri}}> .
+ }
+}LIMIT {{lodspk.maxResults}}