This Fixes #23, #24, #27, #28

Renamed a lot of files to make it clear of what they are,
Removed the json references and dead code that refers to it.
Fixed sample-related issues