Cleanup structure and start adding GUI