Finished survey file hierarchy + saving and load

Also fixed Matching & ranking.