Did most of the work for parsing
renamed parsing files
Everything seems to work now