Deleted common file and moved into real classes.