Restored JS and restructured again