Update libraries, change module order