Fixed initial reading of data from files
Added new classes to begin to extract parts of the files and then process them.