Fixes #7 initial structure.