moved tests into folders
reworked an dmoved tests in cps
...
Merge pull request #7 from toeb/cli_rework

updating mastre branch to create a working basis version