Re-organise functions
Update Readme