Data parsed cleanup - new structure and readme