Restructured a lot. Close to completion.