Restructured organization of wads to be more efficient in the future
with space by using references and interfaces