More structure changes, app is still broken.