Moved structure to be more standard