Rename all the factories to their respective sub folder.
Merge branch 'master' of https://github.com/MartijnSch/marusem into adwords
Move factory to it's real name