Re-arranged things into folders. Also, I cleaned up the data version checking in the monitoring system and split it into files.
Minor changes to rendering