Move classes in a subdirectory matching the namespace
Added factory class