Organized further

Note: Collision.js is not included in skeleton.html