Restructured Figure to have be more general, split into multiple files