Refactored and packaged code
README fix