Add generic parsing functionality
files rearranged
files updates