Created factory and moved basic operations classes