Restructured the code. Most things are back.