Removed old version and restructured.