simplified file structure, added helper methods for dumping / clearing data