Added factory and driver singleton traits, beginning of image and FTP packages