Moved lamp factory to module