Moved files to directories
created a factory