Moved figure to folder and added entities