Refactors structure to be more standard