Fix code layout

Redid code to put methods in separate class and also allow for two
files to be read in by prompting user.
Some changes

Misc. change