Refactoring code to manage better.
Merged all factories into one file for now.
Major refacting of code done.
Distribution of code - module was.

Signed-off-by: Amitav Roy <reachme@amitavroy.com>