Made labels more explicit
Moved factory to session dir
Merge pull request #347 from stefk/minor-changes

Minor changes