Some reorganiztion
Merge branch 'master' of github.com:petertr/sandbox

Some reorganization of folders structure.