Restructured

Added a subfile to Universe and other minor edits.