Fixing src/common imports and add creational - factory method impl