Remove unneccesary files
Reorganize factories
Merge pull request #123 from tuxedio/c-summer-cleaning

Clean up old files and reorganize factories