Changed data files to binary, started compartmentalizing