updates: restructure somehow but still not ready for primetime