Refactored
Add licence header
Updated README