Updated the structure a bit.