Improve structure loading (now recursive) and error handling