fixing dependencies on external modules
renamed and added measurement script parts;moved current to experimental.
Merge pull request #10 from kreczko/master

Fix dependencies, tidy the measurement scripts