Refactored file names to be more abstract
Update readme