More reorganization. Also, renaming server to astronomy-demo.js